diff --git a/src/core/core-command.c b/src/core/core-command.c index 4a129f635..3ec208b68 100644 --- a/src/core/core-command.c +++ b/src/core/core-command.c @@ -307,7 +307,7 @@ COMMAND_CALLBACK(bar) _("%sBar \"%s\" already exists"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } pos_condition = strchr (argv[3], ','); @@ -326,7 +326,7 @@ COMMAND_CALLBACK(bar) _("%sNot enough memory (%s)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "/bar"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } type = gui_bar_search_type (str_type); if (type < 0) @@ -336,7 +336,7 @@ COMMAND_CALLBACK(bar) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], str_type, argv[2]); free (str_type); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } position = gui_bar_search_position (argv[4]); if (position < 0) @@ -346,7 +346,7 @@ COMMAND_CALLBACK(bar) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[4], argv[2]); free (str_type); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } error = NULL; value = strtol (argv[5], &error, 10); @@ -382,6 +382,8 @@ COMMAND_CALLBACK(bar) gui_chat_printf (NULL, _("%sFailed to create bar \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + free (str_type); + return WEECHAT_RC_ERROR; } } else @@ -391,7 +393,7 @@ COMMAND_CALLBACK(bar) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[5], argv[2]); free (str_type); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } free (str_type); @@ -431,7 +433,7 @@ COMMAND_CALLBACK(bar) _("%sBar \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ptr_bar2 = gui_bar_search (argv[3]); if (ptr_bar2) @@ -441,7 +443,7 @@ COMMAND_CALLBACK(bar) "\"%s\" command"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3], "bar rename"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } gui_bar_set (ptr_bar, "name", argv[3]); gui_chat_printf (NULL, _("Bar \"%s\" renamed to \"%s\""), argv[2], argv[3]); @@ -483,7 +485,7 @@ COMMAND_CALLBACK(bar) _("%sBar \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!gui_bar_set (ptr_bar, argv[3], argv_eol[4])) { @@ -491,7 +493,7 @@ COMMAND_CALLBACK(bar) _("%sUnable to set option \"%s\" for bar \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -507,7 +509,7 @@ COMMAND_CALLBACK(bar) _("%sBar \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!CONFIG_BOOLEAN(ptr_bar->options[GUI_BAR_OPTION_HIDDEN])) gui_bar_set (ptr_bar, "hidden", "1"); @@ -525,7 +527,7 @@ COMMAND_CALLBACK(bar) _("%sBar \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (CONFIG_BOOLEAN(ptr_bar->options[GUI_BAR_OPTION_HIDDEN])) gui_bar_set (ptr_bar, "hidden", "0"); @@ -543,7 +545,7 @@ COMMAND_CALLBACK(bar) _("%sBar \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } gui_bar_set (ptr_bar, "hidden", CONFIG_BOOLEAN(ptr_bar->options[GUI_BAR_OPTION_HIDDEN]) ? "0" : "1"); @@ -572,7 +574,7 @@ COMMAND_CALLBACK(bar) gui_chat_printf (NULL, _("%sWindow not found for \"%s\" command"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "bar"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!gui_bar_scroll (ptr_bar, ptr_window, argv_eol[4])) { @@ -580,7 +582,7 @@ COMMAND_CALLBACK(bar) _("%sUnable to scroll bar \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } return WEECHAT_RC_OK; @@ -722,7 +724,7 @@ COMMAND_CALLBACK(buffer) _("%sBuffer name \"%s\" is reserved for WeeChat"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[arg_name]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ptr_buffer = gui_buffer_search (PLUGIN_CORE, argv[arg_name]); if (!ptr_buffer) @@ -829,7 +831,7 @@ COMMAND_CALLBACK(buffer) _("%sInvalid buffer number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -853,7 +855,7 @@ COMMAND_CALLBACK(buffer) _("%sBuffer \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc > 3) { @@ -865,7 +867,7 @@ COMMAND_CALLBACK(buffer) _("%sBuffer \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } else @@ -938,7 +940,7 @@ COMMAND_CALLBACK(buffer) _("%sBuffer \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } gui_buffer_merge (buffer, ptr_buffer); return WEECHAT_RC_OK; @@ -966,7 +968,7 @@ COMMAND_CALLBACK(buffer) _("%sInvalid buffer number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!command_buffer_check_number ((int)number)) COMMAND_ERROR; @@ -1081,7 +1083,7 @@ COMMAND_CALLBACK(buffer) _("%sRenumbering is allowed only if option " "weechat.look.buffer_auto_renumber is off"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } for (i = 0; i < 3; i++) @@ -1097,7 +1099,7 @@ COMMAND_CALLBACK(buffer) _("%sInvalid buffer number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[i + 2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if ((i == 2) && !command_buffer_check_number ((int)numbers[i])) return WEECHAT_RC_OK; @@ -1256,6 +1258,7 @@ COMMAND_CALLBACK(buffer) _("%sUnable to set notify level \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv_eol[2]); + return WEECHAT_RC_ERROR; } } return WEECHAT_RC_OK; @@ -1378,6 +1381,7 @@ COMMAND_CALLBACK(buffer) _("%sUnable to create option for buffer property \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -1502,7 +1506,7 @@ COMMAND_CALLBACK(buffer) _("%sInvalid buffer number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1] + 1); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } return WEECHAT_RC_OK; @@ -1563,7 +1567,7 @@ COMMAND_CALLBACK(buffer) _("%sInvalid buffer number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1] + 1); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } return WEECHAT_RC_OK; @@ -1599,7 +1603,7 @@ COMMAND_CALLBACK(buffer) _("%sInvalid buffer number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1] + 1); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -1689,7 +1693,7 @@ COMMAND_CALLBACK(color) "between %d and %d)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2], 0, gui_color_get_term_colors ()); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* check other arguments */ @@ -1749,7 +1753,7 @@ COMMAND_CALLBACK(color) "between %d and %d)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2], 0, gui_color_get_term_colors ()); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* search color */ @@ -1760,7 +1764,7 @@ COMMAND_CALLBACK(color) _("%sColor \"%s\" is not defined in palette"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* delete color alias */ @@ -1876,7 +1880,7 @@ COMMAND_CALLBACK(command) _("%sBuffer \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } index_args = 3; } @@ -1894,7 +1898,7 @@ COMMAND_CALLBACK(command) gui_chat_printf (NULL, _("%sPlugin \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[index_args]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } if (string_is_command_char (argv_eol[index_args + 1])) @@ -2319,7 +2323,7 @@ command_eval_print_debug (const char *debug) COMMAND_CALLBACK(eval) { - int i, print_only, split_command, condition, debug, error; + int i, rc, print_only, split_command, condition, debug, error; char *result, *ptr_args, **commands, str_debug[32]; const char *debug_output; struct t_hashtable *pointers, *options; @@ -2329,6 +2333,7 @@ COMMAND_CALLBACK(eval) (void) data; (void) argv; + rc = WEECHAT_RC_OK; print_only = 0; split_command = 0; condition = 0; @@ -2496,13 +2501,14 @@ COMMAND_CALLBACK(eval) gui_chat_printf (NULL, _("%sError in expression to evaluate"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + rc = WEECHAT_RC_ERROR; } hashtable_free (pointers); hashtable_free (options); } - return WEECHAT_RC_OK; + return rc; } /* @@ -2739,7 +2745,7 @@ COMMAND_CALLBACK(filter) _("%sYou must specify at least tags " "or regex for filter"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } update = 0; @@ -2796,6 +2802,7 @@ COMMAND_CALLBACK(filter) _("%sFilter \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -2820,6 +2827,7 @@ COMMAND_CALLBACK(filter) "\"%s\" to \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2], argv[3]); + return WEECHAT_RC_ERROR; } } else @@ -2828,6 +2836,7 @@ COMMAND_CALLBACK(filter) _("%sFilter \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -3428,7 +3437,7 @@ COMMAND_CALLBACK(help) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* @@ -3833,6 +3842,7 @@ COMMAND_CALLBACK(item) _("%sUnable to add custom bar item \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], sargv[0]); + return WEECHAT_RC_ERROR; } string_free_split (sargv); @@ -3873,6 +3883,7 @@ COMMAND_CALLBACK(item) _("%sCustom bar item \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -3897,6 +3908,7 @@ COMMAND_CALLBACK(item) "\"%s\" to \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2], argv[3]); + return WEECHAT_RC_ERROR; } } else @@ -3905,6 +3917,7 @@ COMMAND_CALLBACK(item) _("%sCustom bar item \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -4124,7 +4137,7 @@ command_key_reset (int context, const char *key) _("%sUnable to unbind key \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], key); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } else @@ -4141,6 +4154,7 @@ command_key_reset (int context, const char *key) gui_chat_printf (NULL, _("%sKey \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], key); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -4269,7 +4283,7 @@ COMMAND_CALLBACK(key) _("%sContext \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* display a key binding */ @@ -4317,7 +4331,7 @@ COMMAND_CALLBACK(key) _("%sUnable to unbind key \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; @@ -4336,7 +4350,7 @@ COMMAND_CALLBACK(key) _("%sContext \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } gui_key_verbose = 1; @@ -4348,7 +4362,7 @@ COMMAND_CALLBACK(key) _("%sUnable to unbind key \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; @@ -4374,7 +4388,7 @@ COMMAND_CALLBACK(key) _("%sContext \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return command_key_reset (context, argv[3]); @@ -4410,7 +4424,7 @@ COMMAND_CALLBACK(key) _("%sArgument \"-yes\" is required for " "keys reset (security reason)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -4720,7 +4734,7 @@ COMMAND_CALLBACK(layout) _("%sLayout \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ptr_layout2 = gui_layout_search (argv[3]); if (ptr_layout2) @@ -4730,7 +4744,7 @@ COMMAND_CALLBACK(layout) "\"%s\" command"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3], "layout rename"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } gui_layout_rename (ptr_layout, argv[3]); gui_chat_printf (NULL, _("Layout \"%s\" has been renamed to \"%s\""), @@ -5391,7 +5405,7 @@ COMMAND_CALLBACK(print) _("%sBuffer name \"%s\" is reserved for WeeChat"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[arg_new_buffer_name]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ptr_buffer = gui_buffer_search (PLUGIN_CORE, argv[arg_new_buffer_name]); if (!ptr_buffer) @@ -5542,7 +5556,7 @@ COMMAND_CALLBACK(proxy) _("%sProxy \"%s\" already exists"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } type = proxy_search_type (argv[3]); @@ -5552,7 +5566,7 @@ COMMAND_CALLBACK(proxy) _("%sInvalid type \"%s\" for proxy \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } error = NULL; value = strtol (argv[5], &error, 10); @@ -5574,6 +5588,7 @@ COMMAND_CALLBACK(proxy) gui_chat_printf (NULL, _("%sFailed to add proxy \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + return WEECHAT_RC_ERROR; } } else @@ -5582,7 +5597,7 @@ COMMAND_CALLBACK(proxy) _("%sInvalid port \"%s\" for proxy \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[5], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -5621,7 +5636,7 @@ COMMAND_CALLBACK(proxy) _("%sProxy \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!proxy_set (ptr_proxy, argv[3], argv_eol[4])) { @@ -5629,7 +5644,7 @@ COMMAND_CALLBACK(proxy) _("%sUnable to set option \"%s\" for proxy \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -5677,7 +5692,7 @@ COMMAND_CALLBACK(quit) "argument \"-yes\" (see /help %s)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "quit", "quit"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* @@ -5914,7 +5929,7 @@ COMMAND_CALLBACK(repeat) _("%sInvalid number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[arg_count]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } cmd_repeat = malloc (sizeof (*cmd_repeat)); @@ -5924,7 +5939,7 @@ COMMAND_CALLBACK(repeat) _("%sNot enough memory (%s)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "/repeat"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } cmd_repeat->buffer_name = strdup (buffer->full_name); cmd_repeat->command = strdup (argv_eol[arg_count + 1]); @@ -6022,7 +6037,7 @@ COMMAND_CALLBACK(reset) gui_chat_printf (NULL, _("%sReset of all options is not allowed"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (mask) @@ -6190,6 +6205,7 @@ COMMAND_CALLBACK(secure) "available (ligbcrypt version is too old?)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], config_file_option_string (secure_config_crypt_hash_algo)); + return WEECHAT_RC_ERROR; } else if (rc == -3) { @@ -6199,13 +6215,14 @@ COMMAND_CALLBACK(secure) "available (ligbcrypt version is too old?)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], config_file_option_string (secure_config_crypt_cipher)); + return WEECHAT_RC_ERROR; } else if ((rc == -1) || (rc == 0)) { gui_chat_printf (NULL, _("%sFailed to decrypt data: wrong passphrase?"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - + return WEECHAT_RC_ERROR; } else { @@ -6223,7 +6240,7 @@ COMMAND_CALLBACK(secure) _("%sYou must decrypt data still encrypted before " "doing any operation on secured data or passphrase"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* set the passphrase */ @@ -6237,7 +6254,7 @@ COMMAND_CALLBACK(secure) _("%sPassphrase is too long (max: %d chars)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], SECURE_PASSPHRASE_MAX_LENGTH); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } passphrase_was_set = 0; if (secure_passphrase) @@ -6309,6 +6326,7 @@ COMMAND_CALLBACK(secure) _("%sSecured data \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -6676,6 +6694,8 @@ COMMAND_CALLBACK(set) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2], strerror (errno)); + free (value); + return WEECHAT_RC_ERROR; } } else @@ -6694,6 +6714,8 @@ COMMAND_CALLBACK(set) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[2], strerror (errno)); + free (value); + return WEECHAT_RC_ERROR; } } free (value); @@ -6765,13 +6787,13 @@ COMMAND_CALLBACK(set) _("%sFailed to set option \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; case WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND: gui_chat_printf (NULL, _("%sOption \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; default: config_file_search_with_string (argv[1], NULL, NULL, &ptr_option, NULL); @@ -6836,14 +6858,15 @@ COMMAND_CALLBACK(sys) COMMAND_ERROR; } malloc_trim ((size_t)value); + return WEECHAT_RC_OK; #else gui_chat_printf (NULL, _("%sFunction \"%s\" is not available on " "this system"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "malloc_trim"); + return WEECHAT_RC_ERROR; #endif - return WEECHAT_RC_OK; } if (string_strcmp (argv[1], "waitpid") == 0) @@ -6894,7 +6917,7 @@ COMMAND_CALLBACK(toggle) _("%sOption \"%s\" not found"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -6931,7 +6954,7 @@ COMMAND_CALLBACK(toggle) _("%sFailed to set option \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[1]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; case WEECHAT_CONFIG_OPTION_SET_OK_CHANGED: command_set_display_option (ptr_option, _("Option changed: ")); break; @@ -7012,7 +7035,7 @@ COMMAND_CALLBACK(unset) gui_chat_printf (NULL, _("%sReset of all options is not allowed"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (mask) @@ -7186,7 +7209,7 @@ COMMAND_CALLBACK(upgrade) "argument \"-yes\" (see /help %s)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "upgrade", "upgrade"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if ((argc > index_args) @@ -7207,6 +7230,7 @@ COMMAND_CALLBACK(upgrade) _("%sUnable to save WeeChat session " "(files *.upgrade)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + return WEECHAT_RC_ERROR; } gui_chat_printf (NULL, _("WeeChat session saved (files *.upgrade)")); return WEECHAT_RC_OK; @@ -7225,7 +7249,7 @@ COMMAND_CALLBACK(upgrade) "process/thread running (hook type: process, " "connect or url)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ptr_binary = NULL; @@ -7250,7 +7274,7 @@ COMMAND_CALLBACK(upgrade) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], ptr_binary); free (ptr_binary); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if ((!(stat_buf.st_mode & S_IXUSR)) && (!(stat_buf.st_mode & S_IXGRP)) && (!(stat_buf.st_mode & S_IXOTH))) @@ -7261,7 +7285,7 @@ COMMAND_CALLBACK(upgrade) gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], ptr_binary); free (ptr_binary); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } } @@ -7274,7 +7298,7 @@ COMMAND_CALLBACK(upgrade) gui_chat_printf (NULL, _("%sNo binary specified"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -7284,7 +7308,7 @@ COMMAND_CALLBACK(upgrade) _("%sNot enough memory (%s)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], "/upgrade"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (ptr_binary) @@ -7305,7 +7329,7 @@ COMMAND_CALLBACK(upgrade) "(files *.upgrade)"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); free (ptr_binary); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } weechat_quit = 1; @@ -7633,12 +7657,12 @@ COMMAND_CALLBACK(window) _("%sInvalid window number: \"%s\""), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], argv[3]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } win_args = 4; } if (!ptr_win) - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; /* page up */ if (string_strcmp (argv[1], "page_up") == 0) @@ -7824,7 +7848,7 @@ COMMAND_CALLBACK(window) _("%sCan not merge windows, there's no other " "window with same size near current one"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } return WEECHAT_RC_OK; @@ -7839,7 +7863,7 @@ COMMAND_CALLBACK(window) _("%sCan not close window, there's no other " "window with same size near current one"), gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } diff --git a/src/plugins/alias/alias-command.c b/src/plugins/alias/alias-command.c index d8759d2b1..9b67c87eb 100644 --- a/src/plugins/alias/alias-command.c +++ b/src/plugins/alias/alias-command.c @@ -202,7 +202,7 @@ alias_command_cb (const void *pointer, void *data, _("%sAlias \"%s\" already exists"), weechat_prefix ("error"), ptr_alias_name); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } alias_command_add (ptr_alias_name, argv_eol[3], NULL, update); @@ -240,7 +240,7 @@ alias_command_cb (const void *pointer, void *data, _("%sAlias \"%s\" already exists"), weechat_prefix ("error"), ptr_alias_name); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } alias_command_add (ptr_alias_name, argv_eol[4], argv[2], update); @@ -297,6 +297,7 @@ alias_command_cb (const void *pointer, void *data, _("%sAlias \"%s\" not found"), weechat_prefix ("error"), ptr_alias_name); + return WEECHAT_RC_ERROR; } else { @@ -306,6 +307,7 @@ alias_command_cb (const void *pointer, void *data, { weechat_printf (NULL, _("%sAlias \"%s\" already exists"), weechat_prefix ("error"), ptr_alias_name2); + return WEECHAT_RC_ERROR; } else { diff --git a/src/plugins/fset/fset-command.c b/src/plugins/fset/fset-command.c index 09214cac0..299b3255f 100644 --- a/src/plugins/fset/fset-command.c +++ b/src/plugins/fset/fset-command.c @@ -416,7 +416,7 @@ fset_command_fset (const void *pointer, void *data, _("%s%s: there are no options displayed, " "unable to export."), weechat_prefix ("error"), FSET_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!fset_option_export (ptr_filename, with_help)) WEECHAT_COMMAND_ERROR; @@ -434,13 +434,13 @@ fset_command_fset (const void *pointer, void *data, weechat_printf (NULL, _("%s%s: not enough memory"), weechat_prefix ("error"), FSET_PLUGIN_NAME); - break; + return WEECHAT_RC_ERROR; case -1: weechat_printf (NULL, _("%s%s: file \"%s\" not found"), weechat_prefix ("error"), FSET_PLUGIN_NAME, argv_eol[2]); - break; + return WEECHAT_RC_ERROR; default: weechat_printf (NULL, NG_("%d command executed in file \"%s\"", diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 49efb5184..7ddc793fc 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -818,7 +818,7 @@ IRC_COMMAND_CALLBACK(allchan) "irc buffer (server, channel or private)"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "allchan", "-current"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } current_server = 1; ptr_command = argv_eol[i + 1]; @@ -901,7 +901,7 @@ IRC_COMMAND_CALLBACK(allpv) "irc buffer (server, channel or private)"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "allpv", "-current"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } current_server = 1; ptr_command = argv_eol[i + 1]; @@ -1089,7 +1089,7 @@ IRC_COMMAND_CALLBACK(auth) "via server options \"sasl_*\" (or you must give username and " "password)"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "auth"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (weechat_hashtable_has_key (ptr_server->cap_list, "sasl")) @@ -1142,6 +1142,7 @@ IRC_COMMAND_CALLBACK(auth) ptr_server->buffer, _("%s%s: SASL is not supported by the server"), weechat_prefix ("error"), IRC_PLUGIN_NAME); + return WEECHAT_RC_ERROR; } } @@ -1158,7 +1159,7 @@ IRC_COMMAND_CALLBACK(autojoin) const char *ptr_autojoin; char *old_autojoin, *autojoin; enum t_irc_join_sort sort; - int i; + int i, rc; IRC_BUFFER_GET_SERVER_CHANNEL(buffer); IRC_COMMAND_CHECK_SERVER("autojoin", 1, 1); @@ -1169,6 +1170,8 @@ IRC_COMMAND_CALLBACK(autojoin) WEECHAT_COMMAND_MIN_ARGS(2, ""); + rc = WEECHAT_RC_OK; + ptr_autojoin = IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_AUTOJOIN); @@ -1202,6 +1205,7 @@ IRC_COMMAND_CALLBACK(autojoin) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "autojoin add"); + rc = WEECHAT_RC_ERROR; goto end; } irc_join_add_channel_to_autojoin (ptr_server, ptr_channel->name, @@ -1249,6 +1253,7 @@ IRC_COMMAND_CALLBACK(autojoin) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "autojoin add"); + rc = WEECHAT_RC_ERROR; goto end; } irc_join_remove_channel_from_autojoin (ptr_server, @@ -1300,7 +1305,7 @@ end: } free (old_autojoin); - return WEECHAT_RC_OK; + return rc; } /* @@ -1623,7 +1628,7 @@ IRC_COMMAND_CALLBACK(ban) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "ban"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -1649,7 +1654,7 @@ IRC_COMMAND_CALLBACK(ban) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "ban"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, "MODE %s +b", ptr_channel->name); @@ -2119,7 +2124,7 @@ IRC_COMMAND_CALLBACK(cycle) _("%s%s: \"%s\" command can not be executed on a server " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "cycle"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* does nothing on private buffer (cycle has no sense!) */ @@ -2140,7 +2145,7 @@ IRC_COMMAND_CALLBACK(cycle) _("%s%s: \"%s\" command can not be executed on a server " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "part"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* does nothing on private buffer (cycle has no sense!) */ @@ -2296,7 +2301,7 @@ IRC_COMMAND_CALLBACK(dehalfop) ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "dehalfop"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc < 2) @@ -2335,7 +2340,7 @@ IRC_COMMAND_CALLBACK(deop) ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "deop"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc < 2) @@ -2374,7 +2379,7 @@ IRC_COMMAND_CALLBACK(devoice) ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "devoice"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc < 2) @@ -2589,7 +2594,7 @@ IRC_COMMAND_CALLBACK(halfop) ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "halfop"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc < 2) @@ -2736,7 +2741,7 @@ IRC_COMMAND_CALLBACK(ignore) weechat_printf (NULL, _("%s%s: ignore already exists"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -2758,6 +2763,7 @@ IRC_COMMAND_CALLBACK(ignore) { weechat_printf (NULL, _("%s%s: error adding ignore"), weechat_prefix ("error"), IRC_PLUGIN_NAME); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; @@ -2802,7 +2808,7 @@ IRC_COMMAND_CALLBACK(ignore) weechat_printf (NULL, _("%s%s: ignore not found"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } else @@ -2810,7 +2816,7 @@ IRC_COMMAND_CALLBACK(ignore) weechat_printf (NULL, _("%s%s: wrong ignore number"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -2909,7 +2915,7 @@ error: ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "invite"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* @@ -3245,7 +3251,7 @@ IRC_COMMAND_CALLBACK(kick) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "kick"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } pos_channel = ptr_channel->name; pos_nick = argv[1]; @@ -3293,7 +3299,7 @@ IRC_COMMAND_CALLBACK(kickban) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "kickban"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } pos_channel = ptr_channel->name; pos_nick = argv[1]; @@ -3319,7 +3325,7 @@ IRC_COMMAND_CALLBACK(kickban) _("%s%s: mask must begin with nick"), weechat_prefix ("error"), IRC_PLUGIN_NAME); free (nick_only); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* set ban for nick(+host) on channel */ @@ -3558,7 +3564,7 @@ IRC_COMMAND_CALLBACK(list) ptr_server->buffer, _("%s%s: list buffer is not displayed"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (weechat_arraylist_size (ptr_server->list->channels) == 0) { @@ -3566,7 +3572,7 @@ IRC_COMMAND_CALLBACK(list) ptr_server->buffer, _("%s%s: no channels displayed on list buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!irc_list_export (ptr_server, argv_eol[2])) { @@ -3574,7 +3580,7 @@ IRC_COMMAND_CALLBACK(list) ptr_server->buffer, _("%s%s: error exporting channels to file \"%s\""), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv_eol[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -3617,7 +3623,7 @@ IRC_COMMAND_CALLBACK(list) ptr_server->buffer, _("%s%s: not enough memory for regular expression"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ret = weechat_string_regcomp (new_regexp, ptr_regex, @@ -3632,7 +3638,7 @@ IRC_COMMAND_CALLBACK(list) weechat_prefix ("error"), IRC_PLUGIN_NAME, ptr_regex, buf); free (new_regexp); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (ptr_server->cmd_list_regexp) { @@ -3768,7 +3774,7 @@ IRC_COMMAND_CALLBACK(me) ptr_server->buffer, _("%s%s: \"%s\" command can not be executed on a server buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "me"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } irc_command_me_channel (ptr_server, ptr_channel->name, @@ -3831,7 +3837,7 @@ IRC_COMMAND_CALLBACK(mode) _("%s%s: you must specify channel for \"%s\" command if " "you're not in a channel"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "mode"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } irc_command_mode_server (ptr_server, "MODE", ptr_channel, argv_eol[1], @@ -4044,7 +4050,7 @@ IRC_COMMAND_CALLBACK(names) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "names"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (filter[0]) @@ -4236,7 +4242,7 @@ IRC_COMMAND_CALLBACK(notify) NULL, _("%s%s: server \"%s\" not found"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[3]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -4247,7 +4253,7 @@ IRC_COMMAND_CALLBACK(notify) _("%s%s: server must be specified because you are not on an " "irc server or channel"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc > 4) @@ -4274,7 +4280,7 @@ IRC_COMMAND_CALLBACK(notify) NULL, _("%s%s: notify already exists"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -4285,7 +4291,7 @@ IRC_COMMAND_CALLBACK(notify) ptr_server->buffer, _("%sMonitor list is full (%d)"), weechat_prefix ("error"), ptr_server->monitor); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ptr_notify = irc_notify_new (ptr_server, argv[2], check_away); @@ -4309,6 +4315,7 @@ IRC_COMMAND_CALLBACK(notify) NULL, _("%s%s: error adding notification"), weechat_prefix ("error"), IRC_PLUGIN_NAME); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; @@ -4328,7 +4335,7 @@ IRC_COMMAND_CALLBACK(notify) NULL, _("%s%s: server \"%s\" not found"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[3]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -4339,7 +4346,7 @@ IRC_COMMAND_CALLBACK(notify) _("%s%s: server must be specified because you are not on an " "irc server or channel"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (weechat_strcmp (argv[2], "-all") == 0) @@ -4383,7 +4390,7 @@ IRC_COMMAND_CALLBACK(notify) NULL, _("%s%s: notification not found"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -4413,7 +4420,7 @@ IRC_COMMAND_CALLBACK(op) ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "op"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc < 2) @@ -4517,7 +4524,7 @@ IRC_COMMAND_CALLBACK(part) _("%s%s: \"%s\" command can only be executed in a channel " "or private buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "part"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } channel_name = ptr_channel->name; pos_args = argv_eol[1]; @@ -4532,7 +4539,7 @@ IRC_COMMAND_CALLBACK(part) _("%s%s: \"%s\" command can only be executed in a channel or " "private buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "part"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } channel_name = ptr_channel->name; pos_args = NULL; @@ -4788,7 +4795,7 @@ IRC_COMMAND_CALLBACK(quiet) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "quiet"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -4814,7 +4821,7 @@ IRC_COMMAND_CALLBACK(quiet) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "quiet"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } irc_server_sendf (ptr_server, IRC_SERVER_SEND_OUTQ_PRIO_HIGH, NULL, "MODE %s +q", ptr_channel->name); @@ -5055,7 +5062,7 @@ IRC_COMMAND_CALLBACK(remove) ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "remove"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc > index_nick + 1) @@ -5178,7 +5185,7 @@ IRC_COMMAND_CALLBACK(samode) _("%s%s: you must specify channel for \"%s\" command if " "you're not in a channel"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "samode"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } irc_command_mode_server (ptr_server, "SAMODE", ptr_channel, argv_eol[1], @@ -5205,7 +5212,7 @@ IRC_COMMAND_CALLBACK(samode) _("%s%s: you must specify channel for \"%s\" command if " "you're not in a channel"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "samode"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -5858,7 +5865,7 @@ IRC_COMMAND_CALLBACK(server) NULL, _("%s%s: server \"%s\" already exists"), weechat_prefix ("error"), IRC_PLUGIN_NAME, ptr_server2->name); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -5869,7 +5876,7 @@ IRC_COMMAND_CALLBACK(server) NULL, _("%s%s: unable to add server"), weechat_prefix ("error"), IRC_PLUGIN_NAME); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } weechat_config_option_set ( @@ -5913,7 +5920,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" not found for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[2], "server copy"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* check if target name already exists */ @@ -5925,7 +5932,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" already exists for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, ptr_server2->name, "server copy"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* copy server */ @@ -5961,7 +5968,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" not found for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[2], "server rename"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* check if target name already exists */ @@ -5973,7 +5980,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" already exists for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, ptr_server2->name, "server rename"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* rename server */ @@ -6049,6 +6056,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" not found for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[i], "server open"); + return WEECHAT_RC_ERROR; } } } @@ -6069,7 +6077,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" not found for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[2], "server keep"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* check that is it temporary server */ @@ -6080,7 +6088,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" is not a temporary server"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[2], "server keep"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* remove temporary flag on server */ @@ -6110,7 +6118,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: server \"%s\" not found for \"%s\" command"), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[2], "server del"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (server_found->is_connected) { @@ -6119,7 +6127,7 @@ IRC_COMMAND_CALLBACK(server) _("%s%s: you can not delete server \"%s\" because you are " "connected to. Try \"/disconnect %s\" before."), weechat_prefix ("error"), IRC_PLUGIN_NAME, argv[2], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } server_name = strdup (server_found->name); @@ -6443,7 +6451,7 @@ IRC_COMMAND_CALLBACK(topic) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "topic"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -6545,7 +6553,7 @@ IRC_COMMAND_CALLBACK(unban) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "unban"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -6603,7 +6611,7 @@ IRC_COMMAND_CALLBACK(unquiet) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "unquiet"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -6737,7 +6745,7 @@ IRC_COMMAND_CALLBACK(voice) ptr_server->buffer, _("%s%s: \"%s\" command can only be executed in a channel buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "voice"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (argc < 2) @@ -6799,7 +6807,7 @@ IRC_COMMAND_CALLBACK(wallchops) _("%s%s: \"%s\" command can only be executed in a channel " "buffer"), weechat_prefix ("error"), IRC_PLUGIN_NAME, "wallchops"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } @@ -6810,7 +6818,7 @@ IRC_COMMAND_CALLBACK(wallchops) ptr_server->buffer, _("%s%s: you are not on channel \"%s\""), weechat_prefix ("error"), IRC_PLUGIN_NAME, pos_channel); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } weechat_printf ( diff --git a/src/plugins/relay/relay-command.c b/src/plugins/relay/relay-command.c index fb2c22bc9..93df7ee8a 100644 --- a/src/plugins/relay/relay-command.c +++ b/src/plugins/relay/relay-command.c @@ -248,7 +248,7 @@ relay_command_relay (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } relay_server_get_protocol_args (argv[2], NULL, NULL, NULL, @@ -303,6 +303,7 @@ relay_command_relay (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv_eol[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -322,6 +323,7 @@ relay_command_relay (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv_eol[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -342,6 +344,7 @@ relay_command_relay (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv_eol[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -362,6 +365,7 @@ relay_command_relay (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv_eol[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -554,7 +558,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, argv[2], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } update = 1; relay_remote_free (ptr_remote); @@ -566,7 +570,7 @@ relay_command_remote (const void *pointer, void *data, _("%s%s: remote relay \"%s\" already exists"), weechat_prefix ("error"), RELAY_PLUGIN_NAME, ptr_remote->name); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } if (!relay_remote_name_valid (argv[2])) @@ -576,7 +580,7 @@ relay_command_remote (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!relay_remote_url_valid (argv[3])) { @@ -585,7 +589,7 @@ relay_command_remote (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv[3]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } ptr_autoconnect = NULL; ptr_proxy = NULL; @@ -621,7 +625,7 @@ relay_command_remote (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv[i]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } } ptr_remote = relay_remote_new (argv[2], argv[3], ptr_autoconnect, @@ -643,6 +647,7 @@ relay_command_remote (const void *pointer, void *data, _("%s%s: failed to create remote relay \"%s\""), weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv[2]); + return WEECHAT_RC_ERROR; } return WEECHAT_RC_OK; } @@ -660,7 +665,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, argv[2], "remote connect"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } relay_remote_connect (ptr_remote); return WEECHAT_RC_OK; @@ -679,7 +684,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, argv[2], "remote send"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (ptr_remote->status != RELAY_STATUS_CONNECTED) { @@ -689,7 +694,7 @@ relay_command_remote (const void *pointer, void *data, weechat_prefix ("error"), RELAY_PLUGIN_NAME, argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } relay_remote_send (ptr_remote, argv_eol[3]); return WEECHAT_RC_OK; @@ -708,7 +713,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, argv[2], "remote disconnect"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } relay_remote_disconnect (ptr_remote); return WEECHAT_RC_OK; @@ -728,7 +733,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, argv[2], "remote rename"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* check if target name already exists */ ptr_remote2 = relay_remote_search (argv[3]); @@ -741,7 +746,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, ptr_remote2->name, "server rename"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } /* rename remote */ if (relay_remote_rename (ptr_remote, argv[3])) @@ -771,7 +776,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, argv[2], "remote del"); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!RELAY_STATUS_HAS_ENDED(ptr_remote->status)) { @@ -783,7 +788,7 @@ relay_command_remote (const void *pointer, void *data, RELAY_PLUGIN_NAME, argv[2], argv[2]); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } remote_name = strdup (ptr_remote->name); relay_remote_free (ptr_remote); diff --git a/src/plugins/xfer/xfer-command.c b/src/plugins/xfer/xfer-command.c index 9ae1c4ceb..8ae35f766 100644 --- a/src/plugins/xfer/xfer-command.c +++ b/src/plugins/xfer/xfer-command.c @@ -55,7 +55,7 @@ xfer_command_me (const void *pointer, void *data, _("%s%s: can't find xfer for buffer \"%s\""), weechat_prefix ("error"), XFER_PLUGIN_NAME, weechat_buffer_get_string (buffer, "name")); - return WEECHAT_RC_OK; + return WEECHAT_RC_ERROR; } if (!XFER_HAS_ENDED(ptr_xfer->status))