aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Use the PARAM_FLAG_STRIP_TRAILING_WS flag wherever possible.

Browse Source
This commit is contained in:
LemonBoy 2015-11-09 23:02:41 +01:00
parent 3d9b9d473f
commit d4676c9855
11 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-common/core/completion.c
View File

@ -757,7 +757,7 @@ static void cmd_completion(const char *data)
int len; int len;
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_GETREST, PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
"completion", &optlist, &key, &value)) "completion", &optlist, &key, &value))
return; return;

3
src/fe-common/core/fe-ignore.c
View File

@ -127,7 +127,8 @@ static void cmd_ignore(const char *data)
return; return;
} }
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
"ignore", &optlist, &mask, &levels)) "ignore", &optlist, &mask, &levels))
return; return;

5
src/fe-common/core/fe-log.c
View File

@ -87,8 +87,9 @@ static void cmd_log_open(const char *data)
int level; int level;
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS, PARAM_FLAG_UNKNOWN_OPTIONS | PARAM_FLAG_OPTIONS |
"log open", &optlist, &fname, &levels)) PARAM_FLAG_STRIP_TRAILING_WS, "log open", &optlist,
&fname, &levels))
return; return;
if (*fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*fname == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

5
src/fe-common/core/fe-settings.c
View File

@ -108,7 +108,8 @@ static void cmd_set(char *data)
int clear, set_default; int clear, set_default;
SETTINGS_REC *rec; SETTINGS_REC *rec;
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_OPTIONS, if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
PARAM_FLAG_OPTIONS | PARAM_FLAG_STRIP_TRAILING_WS,
"set", &optlist, &key, &value)) "set", &optlist, &key, &value))
return; return;
@ -182,7 +183,7 @@ static void cmd_toggle(const char *data)
void *free_arg; void *free_arg;
int type; int type;
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &key, &value)) if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, &key, &value))
return; return;
if (*key == '\0') if (*key == '\0')

4
src/fe-common/irc/fe-irc-commands.c
View File

@ -246,8 +246,8 @@ static void cmd_ban(const char *data, IRC_SERVER_REC *server,
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 2 | if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN |
PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST, PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
item, &channel, &nicks)) item, &channel, &nicks))
return; return;

12
src/irc/core/bans.c
View File

@ -184,8 +184,8 @@ static void command_set_ban(const char *data, IRC_SERVER_REC *server,
if (server == NULL || !server->connected || !IS_IRC_SERVER(server)) if (server == NULL || !server->connected || !IS_IRC_SERVER(server))
cmd_return_error(CMDERR_NOT_CONNECTED); cmd_return_error(CMDERR_NOT_CONNECTED);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST |
item, &channel, &nicks)) return; PARAM_FLAG_STRIP_TRAILING_WS, item, &channel, &nicks)) return;
if (!server_ischannel(SERVER(server), channel)) cmd_param_error(CMDERR_NOT_JOINED); if (!server_ischannel(SERVER(server), channel)) cmd_param_error(CMDERR_NOT_JOINED);
if (*nicks == '\0') { if (*nicks == '\0') {
if (g_strcmp0(data, "*") != 0) if (g_strcmp0(data, "*") != 0)
@ -262,8 +262,8 @@ static void cmd_ban(const char *data, IRC_SERVER_REC *server, void *item)
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 1 | if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST, PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
"ban", &optlist, &ban)) "ban", &optlist, &ban))
return; return;
@ -297,8 +297,8 @@ static void cmd_unban(const char *data, IRC_SERVER_REC *server, void *item)
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 1 | if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST, PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
"unban", &optlist, &ban)) "unban", &optlist, &ban))
return; return;

12
src/irc/core/irc-commands.c
View File

@ -267,7 +267,8 @@ static void cmd_list(const char *data, IRC_SERVER_REC *server,
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_GETREST, "list", &optlist, &str)) PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
"list", &optlist, &str))
return; return;
if (*str == '\0' && g_hash_table_lookup(optlist, "yes") == NULL && if (*str == '\0' && g_hash_table_lookup(optlist, "yes") == NULL &&
@ -288,7 +289,8 @@ static void cmd_who(const char *data, IRC_SERVER_REC *server,
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &channel, &rest)) if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
PARAM_FLAG_STRIP_TRAILING_WS, &channel, &rest))
return; return;
if (g_strcmp0(channel, "*") == 0 || *channel == '\0') { if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
@ -320,7 +322,8 @@ static void cmd_names(const char *data, IRC_SERVER_REC *server,
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS | if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_GETREST, "names", &optlist, &channel)) PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
"names", &optlist, &channel))
return; return;
if (g_strcmp0(channel, "*") == 0 || *channel == '\0') { if (g_strcmp0(channel, "*") == 0 || *channel == '\0') {
@ -501,7 +504,8 @@ static void cmd_whowas(const char *data, IRC_SERVER_REC *server)
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &nicks, &rest)) if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
&nicks, &rest))
return; return;
if (*nicks == '\0') nicks = server->nick; if (*nicks == '\0') nicks = server->nick;

4
src/irc/core/modes.c
View File

@ -835,10 +835,10 @@ static void cmd_mode(const char *data, IRC_SERVER_REC *server,
if (*data == '+' || *data == '-') { if (*data == '+' || *data == '-') {
target = "*"; target = "*";
if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST, &mode)) if (!cmd_get_params(data, &free_arg, 1 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, &mode))
return; return;
} else { } else {
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &target, &mode)) if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS, &target, &mode))
return; return;
} }

4
src/irc/dcc/dcc-send.c
View File

@ -174,8 +174,8 @@ static void cmd_dcc_send(const char *data, IRC_SERVER_REC *server,
int queue, mode, passive; int queue, mode, passive;
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS |
PARAM_FLAG_GETREST, "dcc send", PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
&optlist, &nick, &fileargs)) "dcc send", &optlist, &nick, &fileargs))
return; return;
chat = item_get_dcc(item); chat = item_get_dcc(item);

4
src/irc/dcc/dcc.c
View File

@ -496,8 +496,8 @@ static void cmd_dcc_close(char *data, IRC_SERVER_REC *server)
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
&typestr, &nick, &arg)) PARAM_FLAG_STRIP_TRAILING_WS, &typestr, &nick, &arg))
return; return;
if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*nick == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

3
src/irc/notifylist/notify-commands.c
View File

@ -36,7 +36,8 @@ static void cmd_notify(gchar *data)
g_return_if_fail(data != NULL); g_return_if_fail(data != NULL);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg,
2 | PARAM_FLAG_OPTIONS | PARAM_FLAG_GETREST | PARAM_FLAG_STRIP_TRAILING_WS,
"notify", &optlist, &mask, &ircnets)) "notify", &optlist, &mask, &ircnets))
return; return;
if (*mask == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*mask == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);