diff --git a/src/box/call.c b/src/box/call.c index 9c291260e3afc968515ce4240a8038ad3c554af5..7839e1f3e1b7419d9183fae21886b19ba62bba46 100644 --- a/src/box/call.c +++ b/src/box/call.c @@ -128,14 +128,7 @@ 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; + return module_reload(name, name + strlen(name)); } int diff --git a/src/box/func.c b/src/box/func.c index 94b14c56c75cc9980755491db3aa32782b84d229..5fdefe3493b3bf1a509d1ae6672778c1399dbc90 100644 --- a/src/box/func.c +++ b/src/box/func.c @@ -372,13 +372,13 @@ 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); @@ -400,7 +400,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 581e468cba69d86ea3ed1511fb85b96012e62695..0a08fa4655ed480609cc3850034aa0b816572d8a 100644 --- a/src/box/func.h +++ b/src/box/func.h @@ -113,12 +113,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" */