commit 883a8fa6f185033102748be6dde1b386ddef54ac from: Alexander Barton date: Sun Feb 24 15:14:13 2013 UTC Add new _IRC_ARGC_BETWEEN_OR_RETURN_ macro to irc-macros.h commit - a7b04ce6cff3613a45864a127dde082a1a4c6aec commit + 883a8fa6f185033102748be6dde1b386ddef54ac blob - bd63ec495f7253f8b20dd9a006e794b1158d7626 blob + 87a6088539d981255fe61fd43b652a24e0072528 --- src/ngircd/irc-macros.h +++ 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