pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 23:36:37 +02:00
Code Activity

core, plugins: use variable "argv" in calls to macro COMMAND_MIN_ARGS

Browse Source
This commit is contained in:
Sébastien Helleu
2024-06-09 10:53:05 +02:00
parent ea3486dae3
commit e06e4d1457
6 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/alias/alias-command.c
+2 -2
View File
@@ -249,7 +249,7 @@ alias_command_cb (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "del") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "del");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
for (i = 2; i < argc; i++)
{
ptr_alias_name = (weechat_string_is_command_char (argv[i])) ?
@@ -283,7 +283,7 @@ alias_command_cb (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "rename") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "rename");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
ptr_alias_name = (weechat_string_is_command_char (argv[2])) ?
(char *)weechat_utf8_next_char (argv[2]) : argv[2];
src/plugins/exec/exec-command.c
+6 -6
View File
@@ -677,7 +677,7 @@ exec_command_exec (const void *pointer, void *data,
/* send text to a running process */
if (weechat_strcmp (argv[1], "-in") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "-in");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd && ptr_exec_cmd->hook)
{
@@ -696,7 +696,7 @@ exec_command_exec (const void *pointer, void *data,
/* send text to a running process (if given), then close stdin */
if (weechat_strcmp (argv[1], "-inclose") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "-inclose");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd && ptr_exec_cmd->hook)
{
@@ -719,7 +719,7 @@ exec_command_exec (const void *pointer, void *data,
/* send a signal to a running process */
if (weechat_strcmp (argv[1], "-signal") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "-signal");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd)
weechat_hook_set (ptr_exec_cmd->hook, "signal", argv[3]);
@@ -729,7 +729,7 @@ exec_command_exec (const void *pointer, void *data,
/* send a KILL signal to a running process */
if (weechat_strcmp (argv[1], "-kill") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "-kill");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd)
weechat_hook_set (ptr_exec_cmd->hook, "signal", "kill");
@@ -753,7 +753,7 @@ exec_command_exec (const void *pointer, void *data,
/* set a hook property */
if (weechat_strcmp (argv[1], "-set") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(5, "-set");
WEECHAT_COMMAND_MIN_ARGS(5, argv[1]);
ptr_exec_cmd = exec_command_search_running_id (argv[2]);
if (ptr_exec_cmd)
weechat_hook_set (ptr_exec_cmd->hook, argv[3], argv_eol[4]);
@@ -763,7 +763,7 @@ exec_command_exec (const void *pointer, void *data,
/* delete terminated command(s) */
if (weechat_strcmp (argv[1], "-del") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "-del");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
if (weechat_strcmp (argv[2], "-all") == 0)
{
count = 0;
src/plugins/irc/irc-command.c
+15 -15
View File
@@ -1230,7 +1230,7 @@ IRC_COMMAND_CALLBACK(autojoin)
if (argc < 3)
{
free (old_autojoin);
WEECHAT_COMMAND_MIN_ARGS(3, "addraw");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
}
irc_join_add_channels_to_autojoin (ptr_server, argv_eol[2]);
goto end;
@@ -2198,7 +2198,7 @@ IRC_COMMAND_CALLBACK(dcc)
/* DCC SEND file */
if (weechat_strcmp (argv[1], "send") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "send");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
infolist = weechat_infolist_new ();
if (infolist)
{
@@ -2225,7 +2225,7 @@ IRC_COMMAND_CALLBACK(dcc)
/* DCC CHAT */
if (weechat_strcmp (argv[1], "chat") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "chat");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
infolist = weechat_infolist_new ();
if (infolist)
{
@@ -2667,7 +2667,7 @@ IRC_COMMAND_CALLBACK(ignore)
/* add ignore */
if (weechat_strcmp (argv[1], "add") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "add");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
mask = argv[2];
server = (argc > 3) ? argv[3] : NULL;
@@ -2752,7 +2752,7 @@ IRC_COMMAND_CALLBACK(ignore)
/* delete ignore */
if (weechat_strcmp (argv[1], "del") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "del");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
if (weechat_strcmp (argv[2], "-all") == 0)
{
@@ -4177,7 +4177,7 @@ IRC_COMMAND_CALLBACK(notify)
/* add notify */
if (weechat_strcmp (argv[1], "add") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "add");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
check_away = 0;
@@ -4260,7 +4260,7 @@ IRC_COMMAND_CALLBACK(notify)
/* delete notify */
if (weechat_strcmp (argv[1], "del") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "del");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
if (argc > 3)
{
@@ -5783,7 +5783,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "add") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "add");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
ptr_server2 = irc_server_search (argv[2]);
if (ptr_server2)
@@ -5833,7 +5833,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "copy") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "copy");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -5881,7 +5881,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "rename") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "rename");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -5928,7 +5928,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "reorder") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "reorder");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
count = irc_server_reorder (((const char **)argv) + 2, argc - 2);
weechat_printf (NULL,
@@ -5940,7 +5940,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "open") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "open");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
if (weechat_strcmp (argv[2], "-all") == 0)
{
@@ -5989,7 +5989,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "keep") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "keep");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -6030,7 +6030,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "del") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "del");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
/* look for server by name */
server_found = irc_server_search (argv[2]);
@@ -6105,7 +6105,7 @@ IRC_COMMAND_CALLBACK(server)
if (weechat_strcmp (argv[1], "fakerecv") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "fakerecv");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
IRC_COMMAND_CHECK_SERVER("server fakerecv", 0, 1);
msg_no_quotes = weechat_string_remove_quotes (argv_eol[2], "\"");
length = strlen (msg_no_quotes);
src/plugins/relay/relay-command.c
+11 -11
View File
@@ -223,7 +223,7 @@ relay_command_relay (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "add") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "add");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
relay_server_get_protocol_args (argv[2], NULL, NULL, NULL,
&unix_socket, NULL, NULL);
rc = relay_config_create_option_port_path (
@@ -246,7 +246,7 @@ relay_command_relay (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "del") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "del");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_server = relay_server_search (argv_eol[2]);
if (ptr_server)
{
@@ -279,7 +279,7 @@ relay_command_relay (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "stop") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "stop");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_server = relay_server_search (argv_eol[2]);
if (ptr_server)
{
@@ -298,7 +298,7 @@ relay_command_relay (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "start") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "start");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_server = relay_server_search (argv_eol[2]);
if (ptr_server)
{
@@ -318,7 +318,7 @@ relay_command_relay (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "restart") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "restart");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_server = relay_server_search (argv_eol[2]);
if (ptr_server)
{
@@ -505,7 +505,7 @@ relay_command_remote (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "add") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "add");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
ptr_remote = relay_remote_search (argv[2]);
if (ptr_remote)
{
@@ -590,7 +590,7 @@ relay_command_remote (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "connect") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "connect");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_remote = relay_remote_search (argv[2]);
if (!ptr_remote)
{
@@ -609,7 +609,7 @@ relay_command_remote (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "send") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "send");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
ptr_remote = relay_remote_search (argv[2]);
if (!ptr_remote)
{
@@ -638,7 +638,7 @@ relay_command_remote (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "disconnect") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "disconnect");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
ptr_remote = relay_remote_search (argv[2]);
if (!ptr_remote)
{
@@ -657,7 +657,7 @@ relay_command_remote (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "rename") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(4, "rename");
WEECHAT_COMMAND_MIN_ARGS(4, argv[1]);
/* look for remote by name */
ptr_remote = relay_remote_search (argv[2]);
if (!ptr_remote)
@@ -700,7 +700,7 @@ relay_command_remote (const void *pointer, void *data,
if (weechat_strcmp (argv[1], "del") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "del");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
/* look for remote by name */
ptr_remote = relay_remote_search (argv[2]);
if (!ptr_remote)
src/plugins/spell/spell-command.c
+2 -2
View File
@@ -429,7 +429,7 @@ spell_command_cb (const void *pointer, void *data,
/* set dictionary for current buffer */
if (weechat_strcmp (argv[1], "setdict") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "setdict");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
dicts = weechat_string_replace (argv_eol[2], " ", "");
spell_command_set_dict (buffer,
(dicts) ? dicts : argv[2]);
@@ -447,7 +447,7 @@ spell_command_cb (const void *pointer, void *data,
/* add word to personal dictionary */
if (weechat_strcmp (argv[1], "addword") == 0)
{
WEECHAT_COMMAND_MIN_ARGS(3, "addword");
WEECHAT_COMMAND_MIN_ARGS(3, argv[1]);
if (argc > 3)
{
/* use a given dict */