mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-01-31 17:49:11 +00:00
Code Issues Releases Wiki Activity

Use _IRC_ARGC_BETWEEN_OR_RETURN_ when possible

Browse Source
This commit is contained in:
Federico G. Schwindt 2013-08-13 18:06:34 +01:00
parent 4828bae8d3
commit b081cfb628
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ngircd/irc-channel.c
View File

@ -309,8 +309,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
assert (Client != NULL); assert (Client != NULL);
assert (Req != NULL); assert (Req != NULL);
_IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(target, Req, Client) _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
/* Is argument "0"? */ /* Is argument "0"? */
@ -438,8 +437,7 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
assert(Client != NULL); assert(Client != NULL);
assert(Req != NULL); assert(Req != NULL);
_IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(target, Req, Client) _IRC_GET_SENDER_OR_RETURN_(target, Req, Client)
/* Loop over all the given channel names */ /* Loop over all the given channel names */
@ -483,8 +481,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req )
IRC_SetPenalty(Client, 1); IRC_SetPenalty(Client, 1);
_IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2)
_IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
_IRC_GET_SENDER_OR_RETURN_(from, Req, Client) _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
chan = Channel_Search(Req->argv[0]); chan = Channel_Search(Req->argv[0]);