Module: ngircd.git Branch: master Commit: 9260759cec948b5b3f1a5e84c435d7afe4313718 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=92607...
Author: Alexander Barton alex@barton.de Date: Fri Jan 6 18:56:53 2012 +0100
DEFAULT_WHOWAS->DEF_RPL_WHOWAS; MAX_CMODES_ARG->MAX_HNDL_MODES_ARG
To streamline naming, in preparation for MAX_RPL_WHO and MAX_RPL_WHOWAS :-)
---
src/ngircd/defines.h | 4 ++-- src/ngircd/irc-info.c | 4 ++-- src/ngircd/irc-mode.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 4d982c7..2613a35 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -179,10 +179,10 @@ /* Defaults and limits for IRC commands */
/** Default count of WHOWAS command replies */ -#define DEFAULT_WHOWAS 5 +#define DEF_RPL_WHOWAS 5
/** Max. number of channel modes with arguments per MODE command */ -#define MAX_CMODES_ARG 5 +#define MAX_HNDL_MODES_ARG 5
#endif diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index c241265..8c87d93 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -1306,7 +1306,7 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req ) if (last < 0) last = 0;
- max = DEFAULT_WHOWAS; + max = DEF_RPL_WHOWAS; if (Req->argc > 1) { max = atoi(Req->argv[1]); if (max < 1) @@ -1568,7 +1568,7 @@ IRC_Send_ISUPPORT(CLIENT * Client) return IRC_WriteStrClient(Client, RPL_ISUPPORT2_MSG, Client_ID(Client), CHANNEL_NAME_LEN - 1, Conf_MaxNickLength - 1, COMMAND_LEN - 23, CLIENT_AWAY_LEN - 1, - COMMAND_LEN - 113, MAX_CMODES_ARG); + COMMAND_LEN - 113, MAX_HNDL_MODES_ARG); } /* IRC_Send_ISUPPORT */
diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 7eb81cf..0c63e72 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -491,7 +491,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) Client_ID(Origin), Channel_Name(Channel)); break; case 'k': /* Channel key */ - if (mode_arg_count++ >= MAX_CMODES_ARG) + if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) goto chan_exit; if (!set) { if (modeok) @@ -527,7 +527,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) } break; case 'l': /* Member limit */ - if (mode_arg_count++ >= MAX_CMODES_ARG) + if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) goto chan_exit; if (!set) { if (modeok) @@ -639,7 +639,7 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel) /* --- Channel lists --- */ case 'I': /* Invite lists */ case 'b': /* Ban lists */ - if (mode_arg_count++ >= MAX_CMODES_ARG) + if (mode_arg_count++ >= MAX_HNDL_MODES_ARG) goto chan_exit; if (arg_arg > mode_arg) { /* modify list */