diff options
| author | Federico G. Schwindt <fgsch@lodoss.net> | 2013-08-13 18:06:34 +0100 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@lodoss.net> | 2013-08-14 00:07:12 +0100 |
| commit | b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584 (patch) | |
| tree | 048ea8722937de08e3ab623edf4e3ae3cccddc87 | |
| parent | 4828bae8d321c6a87a724092ef0f258db7cd7e50 (diff) | |
| download | ngircd-b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584.tar.gz ngircd-b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584.zip | |
Use _IRC_ARGC_BETWEEN_OR_RETURN_ when possible
| -rw-r--r-- | src/ngircd/irc-channel.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 0978a19d..78332ea1 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -309,8 +309,7 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) assert (Client != NULL); assert (Req != NULL); - _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) - _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2) _IRC_GET_SENDER_OR_RETURN_(target, Req, Client) /* Is argument "0"? */ @@ -438,8 +437,7 @@ IRC_PART(CLIENT * Client, REQUEST * Req) assert(Client != NULL); assert(Req != NULL); - _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) - _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2) _IRC_GET_SENDER_OR_RETURN_(target, Req, Client) /* Loop over all the given channel names */ @@ -483,8 +481,7 @@ IRC_TOPIC( CLIENT *Client, REQUEST *Req ) IRC_SetPenalty(Client, 1); - _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1) - _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2) + _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, 1, 2) _IRC_GET_SENDER_OR_RETURN_(from, Req, Client) chan = Channel_Search(Req->argv[0]); |