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

Author: Alexander Barton alex@barton.de Date: Sun Feb 24 18:51:43 2013 +0100

irc-cap.c: use irc-macros.h

---

src/ngircd/irc-cap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c index 52abcec..74c7322 100644 --- a/src/ngircd/irc-cap.c +++ b/src/ngircd/irc-cap.c @@ -24,6 +24,7 @@ #include "conn.h" #include "channel.h" #include "client-cap.h" +#include "irc-macros.h" #include "irc-write.h" #include "log.h" #include "login.h" @@ -249,10 +250,7 @@ IRC_CAP(CLIENT *Client, REQUEST *Req) assert(Client != NULL); assert(Req != NULL);

- /* Bad number of prameters? */ - if (Req->argc < 1 || Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)

LogDebug("Got "%s %s" command from "%s" ...", Req->command, Req->argv[0], Client_ID(Client));