From 3160d2accd1a5e5b0ce4fab8c782a0d402b21bd2 Mon Sep 17 00:00:00 2001 From: "James C. Morey" Date: Sat, 19 Oct 2024 13:37:45 -0500 Subject: [PATCH] core: simplify plugin callback by refactoring if statements --- src/core/core-command.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/src/core/core-command.c b/src/core/core-command.c index d411b41a5..d6ce5483f 100644 --- a/src/core/core-command.c +++ b/src/core/core-command.c @@ -5189,34 +5189,33 @@ COMMAND_CALLBACK(plugin) if (string_strcmp (argv[1], "reload") == 0) { - if (argc > 2) + if (argc < 3) { - if (argc > 3) - { - plugin_argv = string_split ( + plugin_unload_all (); + plugin_auto_load (NULL, 1, 1, 1, 0, NULL); + } + else if (argc == 3) + { + plugin_reload_name (argv[2], 0, NULL); + } + else + { + plugin_argv = string_split ( argv_eol[3], " ", NULL, WEECHAT_STRING_SPLIT_STRIP_LEFT | WEECHAT_STRING_SPLIT_STRIP_RIGHT | WEECHAT_STRING_SPLIT_COLLAPSE_SEPS, 0, &plugin_argc); - if (strcmp (argv[2], "*") == 0) - { - plugin_unload_all (); - plugin_auto_load (NULL, 1, 1, 1, plugin_argc, plugin_argv); - } - else - { - plugin_reload_name (argv[2], plugin_argc, plugin_argv); - } - string_free_split (plugin_argv); + if (strcmp (argv[2], "*") == 0) + { + plugin_unload_all (); + plugin_auto_load (NULL, 1, 1, 1, plugin_argc, plugin_argv); } else - plugin_reload_name (argv[2], 0, NULL); - } - else - { - plugin_unload_all (); - plugin_auto_load (NULL, 1, 1, 1, 0, NULL); + { + plugin_reload_name (argv[2], plugin_argc, plugin_argv); + } + string_free_split (plugin_argv); } return WEECHAT_RC_OK; }