Module: ngircd.git Branch: master Commit: 883a8fa6f185033102748be6dde1b386ddef54ac URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=883a8...

Author: Alexander Barton alex@barton.de Date: Sun Feb 24 16:14:13 2013 +0100

Add new _IRC_ARGC_BETWEEN_OR_RETURN_ macro to irc-macros.h

---

src/ngircd/irc-macros.h | 11 +++++++++++ 1 file changed, 11 insertions(+)

diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h index bd63ec4..87a6088 100644 --- a/src/ngircd/irc-macros.h +++ b/src/ngircd/irc-macros.h @@ -40,6 +40,17 @@ if (Req->argc < Min) \ Client_ID(Client), Req->command);

/** + * Make sure that number of passed parameters is in between Min and Max. + * + * If there aren't at least Min parameters or if there are more than Max + * parameters, send an error to the client and return from the function. + */ +#define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \ +if (Req->argc < Min || Req->argc > Max) \ + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \ + Client_ID(Client), Req->command); + +/** * Get sender of an IRC command. * * The sender is either stored in the prefix if the command has been