[Tarantool-patches] [PATCH 1/4] box/func: drop redundant module argument

[Cyrill Gorcunov]

This argument is only needed if there is
no such module present. Just setup error
inside module_reload function.

Part-of #4642

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 src/box/call.c | 11 +++--------
 src/box/func.c |  8 +++-----
 src/box/func.h |  3 +--
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/box/call.c b/src/box/call.c
index 9c291260e..bffd17c5a 100644
--- a/src/box/call.c
+++ b/src/box/call.c
@@ -128,14 +128,9 @@ box_module_reload(const char *name)
 				 user->def->name);
 		return -1;
 	}
-	struct module *module = NULL;
-	if (module_reload(name, name + strlen(name), &module) == 0) {
-		if (module != NULL)
-			return 0;
-		else
-			diag_set(ClientError, ER_NO_SUCH_MODULE, name);
-	}
-	return -1;
+	if (module_reload(name, name + strlen(name)) != 0)
+		return -1;
+	return 0;
 }
 
 int
diff --git a/src/box/func.c b/src/box/func.c
index f77cf00f8..0d552652d 100644
--- a/src/box/func.c
+++ b/src/box/func.c
@@ -259,13 +259,12 @@ module_sym(struct module *module, const char *name)
 }
 
 int
-module_reload(const char *package, const char *package_end, struct module **module)
+module_reload(const char *package, const char *package_end)
 {
 	struct module *old_module = module_cache_find(package, package_end);
 	if (old_module == NULL) {
-		/* Module wasn't loaded - do nothing. */
-		*module = NULL;
-		return 0;
+		diag_set(ClientError, ER_NO_SUCH_MODULE, package);
+		return -1;
 	}
 
 	struct module *new_module = module_load(package, package_end);
@@ -286,7 +285,6 @@ module_reload(const char *package, const char *package_end, struct module **modu
 	if (module_cache_put(new_module) != 0)
 		goto restore;
 	module_gc(old_module);
-	*module = new_module;
 	return 0;
 restore:
 	/*
diff --git a/src/box/func.h b/src/box/func.h
index ac9772dfe..c6861df8e 100644
--- a/src/box/func.h
+++ b/src/box/func.h
@@ -112,12 +112,11 @@ func_call(struct func *func, struct port *args, struct port *ret);
  *
  * @param package name begin pointer.
  * @param package_end package_end name end pointer.
- * @param[out] module a pointer to store module object on success.
  * @retval -1 on error.
  * @retval 0 on success.
  */
 int
-module_reload(const char *package, const char *package_end, struct module **module);
+module_reload(const char *package, const char *package_end);
 
 #if defined(__cplusplus)
 } /* extern "C" */
-- 
2.29.2