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

Remove use of quote_it() from LameKick() and masskick()

Browse Source 
The use of quote_it() is unnecessary - we can just directly use my_send_to_server()
to construct the message.

Preparation to remove quote_it() entirely.
This commit is contained in:
Kevin Easton
2016-10-09 23:22:18 +11:00
parent 41d98dc5f5
commit 08e3c99720
1 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
source/banlist.c
View File

@@ -163,19 +163,18 @@ BUILT_IN_COMMAND(LameKick)
{ {
ChannelList *chan; ChannelList *chan;
NickList *tmp; NickList *tmp;
char *channel = NULL, *buffer = NULL, *buf2 = NULL; char *channel = NULL;
int old_server = from_server; int old_server = from_server;
if (args && *args && is_channel(args)) if (args && *args && is_channel(args))
channel = next_arg(args, &args); channel = next_arg(args, &args);
if ((chan = prepare_command(&from_server, channel, NEED_OP))) if ((chan = prepare_command(&from_server, channel, NEED_OP)))
{ {
int len_buffer, count = 0, total = 0; int count = 0, total = 0;
char reason[BIG_BUFFER_SIZE+1]; char *targets = NULL;
*reason = 0; const char * const reason = args ? args : empty_string;
quote_it(args ? args : empty_string, NULL, reason); const size_t cmd_len = strlen(chan->channel) + strlen("KICK :<\002BX\002-LK> ") + strlen(reason);
malloc_sprintf(&buffer, "KICK %%s %%s :<\002BX\002-LK> %s", reason);
len_buffer = strlen(buffer) + 2;
for (tmp = next_nicklist(chan, NULL); tmp; tmp = next_nicklist(chan, tmp)) for (tmp = next_nicklist(chan, NULL); tmp; tmp = next_nicklist(chan, tmp))
{ {
int level = 0; int level = 0;
@@ -183,23 +182,22 @@ BUILT_IN_COMMAND(LameKick)
level = ((tmp->userlist->flags | 0xff) & PROT_ALL); level = ((tmp->userlist->flags | 0xff) & PROT_ALL);
if (!nick_isop(tmp) && !nick_isvoice(tmp) && ((tmp->userlist && !level) || !tmp->userlist)) if (!nick_isop(tmp) && !nick_isvoice(tmp) && ((tmp->userlist && !level) || !tmp->userlist))
{ {
m_s3cat(&buf2, ",", tmp->nick); m_s3cat(&targets, ",", tmp->nick);
count++; count++;
total++; total++;
if (((get_int_var(NUM_KICKS_VAR)) && if (((get_int_var(NUM_KICKS_VAR)) &&
(count >= get_int_var(NUM_KICKS_VAR))) || (count >= get_int_var(NUM_KICKS_VAR))) ||
(strlen(buf2) + len_buffer) >= (IRCD_BUFFER_SIZE - (NICKNAME_LEN + 5))) (strlen(targets) + cmd_len) >= (MAX_PROTOCOL_SIZE - (NICKNAME_LEN + 5)))
{ {
my_send_to_server(from_server, buffer, chan->channel, buf2); my_send_to_server(from_server, "KICK %s %s :<\002BX\002-LK> %s", chan->channel, targets, reason);
new_free(&buf2); new_free(&targets);
count = 0; count = 0;
} }
} }
} }
if (buf2) if (targets)
my_send_to_server(from_server, buffer, chan->channel, buf2); my_send_to_server(from_server, "KICK %s %s :<\002BX\002-LK> %s", chan->channel, targets, reason);
new_free(&buffer); new_free(&targets);
new_free(&buf2);
say("Sent the Server all the Lamer Kicks, Sit back and Watch %d kicks!", total); say("Sent the Server all the Lamer Kicks, Sit back and Watch %d kicks!", total);
} }
from_server = old_server; from_server = old_server;
@@ -679,29 +677,28 @@ BUILT_IN_COMMAND(masskick)
if (masskick_list) if (masskick_list)
{ {
int len, num = 0; int num = 0;
char *send_buf = NULL; char *targets = NULL;
char buf[BIG_BUFFER_SIZE + 1]; const char * const reason = rest ? rest : "MassKick";
char reason[BIG_BUFFER_SIZE+1]; const size_t cmd_len = strlen(chan->channel) + strlen("KICK :\002\002") + strlen(reason);
*reason = 0;
quote_it(rest ? rest : "MassKick", NULL, reason);
bitchsay("Performing (%s) Mass Kick on %s", all ? "opz/non-opz" : ops ? "ops":"non-opz", chan->channel); bitchsay("Performing (%s) Mass Kick on %s", all ? "opz/non-opz" : ops ? "ops":"non-opz", chan->channel);
sprintf(buf, "KICK %%s %%s :\002%s\002", reason);
len = strlen(buf);
for (new = masskick_list; new; new = new->next) for (new = masskick_list; new; new = new->next)
{ {
send_buf = m_s3cat(&send_buf, ",", new->filter); m_s3cat(&targets, ",", new->filter);
num++; num++;
if ((get_int_var(NUM_KICKS_VAR) && (num == get_int_var(NUM_KICKS_VAR))) || (strlen(send_buf)+len) >= (IRCD_BUFFER_SIZE - (NICKNAME_LEN + 5))) if ((get_int_var(NUM_KICKS_VAR) && (num == get_int_var(NUM_KICKS_VAR))) ||
(strlen(targets) + cmd_len) >= (MAX_PROTOCOL_SIZE - (NICKNAME_LEN + 5)))
{ {
num = 0; num = 0;
my_send_to_server(server, buf, chan->channel, send_buf); my_send_to_server(server, "KICK %s %s :\002%s\002", chan->channel, targets, reason);
new_free(&send_buf); new_free(&targets);
} }
} }
if (send_buf) if (targets)
my_send_to_server(server, buf, chan->channel, send_buf); my_send_to_server(server, "KICK %s %s :\002%s\002", chan->channel, targets, reason);
new_free(&send_buf); new_free(&targets);
shitlist_erase(&masskick_list); shitlist_erase(&masskick_list);
} }
else else