philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rearrange code in bankick() to silence a compiler warning

Browse Source 
Re-checking the command name to see if it's a timed ban means that the
compiler can't see that it's the same check.

This also makes sure you can't specify a negative timeout.
This commit is contained in:
Kevin Easton
2015-06-24 23:38:28 +10:00
parent 28bd7a66b6
commit ee0cd23ae5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/banlist.c
View File

@@ -981,7 +981,7 @@ BUILT_IN_COMMAND(kickban)
NickList *nicks; NickList *nicks;
char *to, *tspec, *tnick, *rest, *spec = NULL; char *to, *tspec, *tnick, *rest, *spec = NULL;
int count = 0, kick_first = 0, set_ignore = 0, server; int count = 0, kick_first = 0, set_ignore = 0, server;
time_t time; int time = -1;
to = next_arg(args, &args); to = next_arg(args, &args);
if (to && !is_channel(to)) if (to && !is_channel(to))
@@ -1008,10 +1008,11 @@ BUILT_IN_COMMAND(kickban)
if (command && (!my_stricmp(command, "TBK") || !my_stricmp(command, "TKB"))) if (command && (!my_stricmp(command, "TBK") || !my_stricmp(command, "TKB")))
{ {
char *string_time; char *string_time = next_arg(args, &args);
time = get_cset_int_var(chan->csets, BANTIME_CSET); if (string_time)
if ((string_time = next_arg(args, &args)))
time = atoi(string_time); time = atoi(string_time);
if (time < 0)
time = get_cset_int_var(chan->csets, BANTIME_CSET);
rest = args; rest = args;
if (!rest || !*rest) if (!rest || !*rest)
rest = m_sprintf("Timed kickban for %s", convert_time(time)); rest = m_sprintf("Timed kickban for %s", convert_time(time));
@@ -1050,8 +1051,10 @@ BUILT_IN_COMMAND(kickban)
chan->channel, nicks->nick, ban_it(nicks->nick, user, host, nicks->ip), chan->channel, nicks->nick, ban_it(nicks->nick, user, host, nicks->ip),
chan->channel, nicks->nick, rest ? rest : get_reason(nicks->nick, NULL)); chan->channel, nicks->nick, rest ? rest : get_reason(nicks->nick, NULL));
count++; count++;
if (command && (!my_stricmp(command, "TKB") || !my_stricmp(command, "TBK"))) if (time >= 0)
add_timer(0, empty_string, time*1000, 1, timer_unban, m_sprintf("%d %s %s", from_server, chan->channel, ban_it(nicks->nick, user, host, nicks->ip)), NULL, -1, "timed-unban"); add_timer(0, empty_string, time * 1000.0, 1, timer_unban,
m_sprintf("%d %s %s", from_server, chan->channel, ban_it(nicks->nick, user, host, nicks->ip)),
NULL, -1, "timed-unban");
else if (command && !my_stricmp(command, "FUCK")) else if (command && !my_stricmp(command, "FUCK"))
{ {
char *temp = NULL; char *temp = NULL;