From f5135277af8a3379e0b0e0944bb8a045557fd9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 24 Dec 2022 19:37:40 +0100 Subject: [PATCH] core: remove useless conditions --- src/core/wee-command.c | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/src/core/wee-command.c b/src/core/wee-command.c index c74ac1625..1d4444b13 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -193,23 +193,21 @@ COMMAND_CALLBACK(bar) (void) buffer; /* list of bars */ - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0))) + if ((argc == 1) || (string_strcasecmp (argv[1], "list") == 0)) { command_bar_list (0); return WEECHAT_RC_OK; } /* full list of bars */ - if ((argc == 2) && (string_strcasecmp (argv[1], "listfull") == 0)) + if (string_strcasecmp (argv[1], "listfull") == 0) { command_bar_list (1); return WEECHAT_RC_OK; } /* list of bar items */ - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "listitems") == 0))) + if (string_strcasecmp (argv[1], "listitems") == 0) { if (gui_bar_items) { @@ -225,8 +223,9 @@ COMMAND_CALLBACK(bar) } } else + { gui_chat_printf (NULL, _("No bar item defined")); - + } return WEECHAT_RC_OK; } @@ -568,8 +567,7 @@ COMMAND_CALLBACK(buffer) (void) pointer; (void) data; - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0))) + if ((argc == 1) || (string_strcasecmp (argv[1], "list") == 0)) { /* list buffers */ gui_chat_printf (NULL, ""); @@ -1840,8 +1838,7 @@ COMMAND_CALLBACK(debug) (void) pointer; (void) data; - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0))) + if ((argc == 1) || (string_strcasecmp (argv[1], "list") == 0)) { gui_chat_printf (NULL, ""); gui_chat_printf (NULL, "Debug:"); @@ -2302,8 +2299,7 @@ COMMAND_CALLBACK(filter) (void) pointer; (void) data; - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0))) + if ((argc == 1) || (string_strcasecmp (argv[1], "list") == 0)) { /* display all filters */ gui_chat_printf_date_tags (NULL, 0, GUI_FILTER_TAG_NO_FILTER, ""); @@ -2832,8 +2828,7 @@ COMMAND_CALLBACK(help) (void) argv_eol; /* display help for all commands */ - if ((argc == 1) - || ((argc > 1) && (string_strncasecmp (argv[1], "-list", 5) == 0))) + if ((argc == 1) || (string_strncasecmp (argv[1], "-list", 5) == 0)) { verbose = ((argc > 1) && (string_strcasecmp (argv[1], "-listfull") == 0)); if (argc > 2) @@ -3421,8 +3416,7 @@ COMMAND_CALLBACK(item) (void) pointer; (void) data; - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0))) + if ((argc == 1) || (string_strcasecmp (argv[1], "list") == 0)) { /* display all custom bar items */ if (gui_custom_bar_items) @@ -5258,8 +5252,7 @@ COMMAND_CALLBACK(proxy) (void) buffer; /* list of bars */ - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0))) + if ((argc == 1) || (string_strcasecmp (argv[1], "list") == 0)) { command_proxy_list (); return WEECHAT_RC_OK; @@ -6981,8 +6974,7 @@ COMMAND_CALLBACK(window) (void) buffer; (void) argv_eol; - if ((argc == 1) - || ((argc == 2) && (string_strcasecmp (argv[1], "list") == 0))) + if ((argc == 1) || (string_strcasecmp (argv[1], "list") == 0)) { /* list all windows */ gui_chat_printf (NULL, "");