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

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

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

---

src/ngircd/irc-op.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 0297015..23fcc71 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -24,6 +24,7 @@ #include "defines.h" #include "conn.h" #include "channel.h" +#include "irc-macros.h" #include "irc-write.h" #include "lists.h" #include "log.h" @@ -69,9 +70,8 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) assert( Client != NULL ); assert( Req != NULL );

- if ((Req->argc < 2) || (Req->argc > 3)) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 2, 3) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)

while (*itemList) { if (*itemList == ',') { @@ -90,15 +90,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req) itemList++; }

- if (Client_Type(Client) == CLIENT_SERVER) - from = Client_Search(Req->prefix); - else - from = Client; - - if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); - reason = Req->argc == 3 ? Req->argv[2] : Client_ID(from); currentNick = Req->argv[1]; currentChannel = Req->argv[0]; @@ -155,17 +146,8 @@ IRC_INVITE(CLIENT *Client, REQUEST *Req) assert( Client != NULL ); assert( Req != NULL );

- if (Req->argc != 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); - - if (Client_Type(Client) == CLIENT_SERVER) - from = Client_Search(Req->prefix); - else - from = Client; - if (!from) - return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, - Client_ID(Client), Req->prefix); + _IRC_ARGC_EQ_OR_RETURN_(Client, Req, 2) + _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)

/* Search user */ target = Client_Search(Req->argv[0]);