From: Serge Petrenko via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: Cyrill Gorcunov <gorcunov@gmail.com>, tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v20 2/7] box/func: module_reload -- drop redundant argument Date: Mon, 5 Apr 2021 13:23:03 +0300 [thread overview] Message-ID: <dbcdf26a-b9b5-e287-d5b3-3c69cb336d81@tarantool.org> (raw) In-Reply-To: <20210402123420.885834-3-gorcunov@gmail.com> 02.04.2021 15:34, Cyrill Gorcunov пишет: > The only purpose of the module argument is to > notify the caller that the module doesn't exist. > Lets simply the code and drop this argument. > > Part-of #4642 > > Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> > --- Thanks for the patch! LGTM. > src/box/call.c | 9 +-------- > src/box/func.c | 7 +++---- > src/box/func.h | 3 +-- > 3 files changed, 5 insertions(+), 14 deletions(-) > > diff --git a/src/box/call.c b/src/box/call.c > index 9c291260e..7839e1f3e 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 9909cee45..233696a4f 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); > @@ -399,7 +399,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 581e468cb..0a08fa465 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" */ -- Serge Petrenko
next prev parent reply other threads:[~2021-04-05 10:23 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-02 12:34 [Tarantool-patches] [PATCH v20 0/7] box: implement box.lib Lua module Cyrill Gorcunov via Tarantool-patches 2021-04-02 12:34 ` [Tarantool-patches] [PATCH v20 1/7] box/schema: make sure hashes are created Cyrill Gorcunov via Tarantool-patches 2021-04-05 9:28 ` Serge Petrenko via Tarantool-patches 2021-04-05 9:50 ` Cyrill Gorcunov via Tarantool-patches 2021-04-05 10:13 ` Serge Petrenko via Tarantool-patches 2021-04-05 15:45 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-06 7:44 ` Cyrill Gorcunov via Tarantool-patches 2021-04-02 12:34 ` [Tarantool-patches] [PATCH v20 2/7] box/func: module_reload -- drop redundant argument Cyrill Gorcunov via Tarantool-patches 2021-04-05 10:23 ` Serge Petrenko via Tarantool-patches [this message] 2021-04-05 10:26 ` Serge Petrenko via Tarantool-patches 2021-04-05 10:31 ` Cyrill Gorcunov via Tarantool-patches 2021-04-02 12:34 ` [Tarantool-patches] [PATCH v20 3/7] box/func: fix modules functions restore Cyrill Gorcunov via Tarantool-patches 2021-04-05 10:53 ` Serge Petrenko via Tarantool-patches 2021-04-05 11:26 ` Cyrill Gorcunov via Tarantool-patches 2021-04-05 11:42 ` Serge Petrenko via Tarantool-patches 2021-04-05 15:47 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-06 8:38 ` Cyrill Gorcunov via Tarantool-patches 2021-04-06 20:02 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-06 20:42 ` Cyrill Gorcunov via Tarantool-patches 2021-04-02 12:34 ` [Tarantool-patches] [PATCH v20 4/7] box/module_cache: introduce modules subsystem Cyrill Gorcunov via Tarantool-patches 2021-04-05 12:34 ` Serge Petrenko via Tarantool-patches 2021-04-05 15:52 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-06 14:33 ` Cyrill Gorcunov via Tarantool-patches 2021-04-06 20:09 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-06 22:05 ` Cyrill Gorcunov via Tarantool-patches 2021-04-06 23:43 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-07 7:03 ` Cyrill Gorcunov via Tarantool-patches 2021-04-02 12:34 ` [Tarantool-patches] [PATCH v20 5/7] box/schema.func: switch to new module api Cyrill Gorcunov via Tarantool-patches 2021-04-05 15:56 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-02 12:34 ` [Tarantool-patches] [PATCH v20 6/7] box: implement box.lib module Cyrill Gorcunov via Tarantool-patches 2021-04-05 16:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-07 16:59 ` Cyrill Gorcunov via Tarantool-patches 2021-04-07 20:22 ` Cyrill Gorcunov via Tarantool-patches 2021-04-07 20:28 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-07 20:37 ` Cyrill Gorcunov via Tarantool-patches 2021-04-07 20:45 ` Cyrill Gorcunov via Tarantool-patches 2021-04-07 21:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-02 12:34 ` [Tarantool-patches] [PATCH v20 7/7] test: add box.lib test Cyrill Gorcunov via Tarantool-patches 2021-04-05 16:04 ` Vladislav Shpilevoy via Tarantool-patches 2021-04-05 15:45 ` [Tarantool-patches] [PATCH v20 0/7] box: implement box.lib Lua module Vladislav Shpilevoy via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=dbcdf26a-b9b5-e287-d5b3-3c69cb336d81@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v20 2/7] box/func: module_reload -- drop redundant argument' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox