From 736777bea32a2140f5baad3a1a532a61f4b9e1a1 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Tue, 6 Sep 2011 06:48:57 +0000 Subject: [PATCH] Change instances of open-coded "3" in calls to prepare_command() with PC_SILENT macro. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@137 13b04d17-f746-0410-82c6-800466cd88b0 --- include/misc.h | 3 ++- source/ctcp.c | 6 +++--- source/input.c | 4 ++-- source/misc.c | 4 ++-- source/names.c | 2 +- source/status.c | 12 ++++++------ source/userlist.c | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/include/misc.h b/include/misc.h index 5d29309..48a891c 100644 --- a/include/misc.h +++ b/include/misc.h @@ -35,7 +35,8 @@ enum color_attributes { REVERSE_COLOR, BOLD_COLOR, BLINK_COLOR, UNDERLINE_COLOR }; -#define DONT_CARE 3 +/* prepare_command() flags */ +#define PC_SILENT 3 #define PC_TOPIC 2 #define NEED_OP 1 #define NO_OP 0 diff --git a/source/ctcp.c b/source/ctcp.c index 6597901..19bfd82 100644 --- a/source/ctcp.c +++ b/source/ctcp.c @@ -406,7 +406,7 @@ int serv = from_server; return NULL; tmp = lookup_userlevelc("*", FromUserHost, channel, password); - chan = prepare_command(&serv, channel, 3); + chan = prepare_command(&serv, channel, PC_SILENT); if (chan && tmp && (tmp->flags & ADD_INVITE) && (check_channel_match(tmp->channels, channel))) { if (tmp->password && !password) @@ -512,7 +512,7 @@ int serv = from_server; if (cmd && *cmd) password = next_arg(cmd, &cmd); Nick = lookup_userlevelc("*", FromUserHost, channel, password); - chan = prepare_command(&serv, channel, 3); + chan = prepare_command(&serv, channel, PC_SILENT); if (chan && get_cset_int_var(chan->csets, USERLIST_CSET) && Nick) { if (Nick->flags & ADD_OPS) @@ -587,7 +587,7 @@ int server; password = next_arg(cmd, &cmd); Nick = lookup_userlevelc("*", FromUserHost, channel, password); - chan = prepare_command(&server, channel, 3); + chan = prepare_command(&server, channel, PC_SILENT); if (chan && get_cset_int_var(chan->csets, USERLIST_CSET) && Nick && (Nick->flags & ADD_UNBAN)) { diff --git a/source/input.c b/source/input.c index 8488df8..aa69b3b 100644 --- a/source/input.c +++ b/source/input.c @@ -2050,7 +2050,7 @@ static NickTab sucks = { NULL }; } } - if ((chan = prepare_command(&server, NULL, 3))) + if ((chan = prepare_command(&server, NULL, PC_SILENT))) { cnick = next_nicklist(chan, NULL); /* @@ -2286,7 +2286,7 @@ int globtype = GLOB_MARK; NickList *cnick = NULL; ChannelList *chan = NULL; int server = from_server; - chan = prepare_command(&server, NULL, 3); + chan = prepare_command(&server, NULL, PC_SILENT); if (possible && (*possible == '#' || *possible == '&')) { int len = strlen(possible); diff --git a/source/misc.c b/source/misc.c index 0cbe6ca..2961b98 100644 --- a/source/misc.c +++ b/source/misc.c @@ -527,7 +527,7 @@ BanList *b; { if (!(channel = make_channel(channel))) return; - if (!(new = prepare_command(&server, channel, 3))) + if (!(new = prepare_command(&server, channel, PC_SILENT))) if ((channel && !(new1 = check_whowas_chan_buffer(channel, -1, 0)))) return; } @@ -631,7 +631,7 @@ put_it("%s", convert_output_format("IRCops %K[%W$[3]0%K]%w$1-", "%d %s", num } else { - if (!(new = prepare_command(&server, channel, 3))) + if (!(new = prepare_command(&server, channel, PC_SILENT))) if ((channel && !(new1 = check_whowas_chan_buffer(channel, -1, 0)))) return; } diff --git a/source/names.c b/source/names.c index a5f3c71..4a300ac 100644 --- a/source/names.c +++ b/source/names.c @@ -1883,7 +1883,7 @@ int got_info(char *chan, int server, int type) if ((tmp->gotinfo |= type) == what_info) { - if (prepare_command(&tmp->server, chan, 3)) + if (prepare_command(&tmp->server, chan, PC_SILENT)) show_channel_sync(tmp, chan); remove_from_join_list(chan, tmp->server); return 1; diff --git a/source/status.c b/source/status.c index 6962741..c260dab 100644 --- a/source/status.c +++ b/source/status.c @@ -1481,7 +1481,7 @@ NickList *nick; int serv = window->server; if (window->server != -1 && window->wset->status_users_format) { - if ((chan = prepare_command(&serv, NULL, 3))) + if ((chan = prepare_command(&serv, NULL, PC_SILENT))) { int ops = 0, nonops = 0, voice = 0, ircop = 0, friends = 0; char buff[40], buff1[40], buff2[40], buff3[40], buff4[40]; @@ -1540,7 +1540,7 @@ int serv = window->server; static char my_buffer[3] = "\0"; if (window->server != -1) { - if ((chan = prepare_command(&serv, NULL, 3))) + if ((chan = prepare_command(&serv, NULL, PC_SILENT))) { my_buffer[0] = chan->csets->set_userlist ? 'U':'u'; return my_buffer; @@ -1556,7 +1556,7 @@ int serv = window->server; static char my_buffer[3] = "\0"; if (window->server != -1) { - if ((chan = prepare_command(&serv, NULL, 3))) + if ((chan = prepare_command(&serv, NULL, PC_SILENT))) { my_buffer[0] = chan->csets->set_shitlist ? 'S':'s'; return my_buffer; @@ -1572,7 +1572,7 @@ int serv = window->server; static char my_buffer[3] = "\0"; if (window->server != -1) { - if ((chan = prepare_command(&serv, NULL, 3))) + if ((chan = prepare_command(&serv, NULL, PC_SILENT))) { my_buffer[0] = chan->csets->set_hacking ? 'H':'h'; return my_buffer; @@ -1588,7 +1588,7 @@ int serv = window->server; static char my_buffer[3] = "\0"; if (window->server != -1) { - if ((chan = prepare_command(&serv, NULL, 3))) + if ((chan = prepare_command(&serv, NULL, PC_SILENT))) { my_buffer[0] = chan->csets->set_aop ? 'A':'a'; return my_buffer; @@ -1604,7 +1604,7 @@ int serv = window->server; static char my_buffer[3] = "\0"; if (window->server != -1) { - if ((chan = prepare_command(&serv, NULL, 3))) + if ((chan = prepare_command(&serv, NULL, PC_SILENT))) { my_buffer[0] = chan->csets->bitch_mode ? 'B':'b'; return my_buffer; diff --git a/source/userlist.c b/source/userlist.c index 632aba4..cf30829 100644 --- a/source/userlist.c +++ b/source/userlist.c @@ -1017,7 +1017,7 @@ char *p = (char *) arg; /* original args unmodified so we can free them */ channel = next_arg(args, &args); if ((serv_num = next_arg(args, &args))) this_server = my_atol(serv_num); - if ((chan = prepare_command(&server, channel, 3))) + if ((chan = prepare_command(&server, channel, PC_SILENT))) my_send_to_server(this_server, "KICK %s %s :\002%s\002 Kick/ban me will ya", channel, from, _VERSION_); new_free(&protected); }