repo: ngircd
action: commit
revision: 
path_from: 
revision_from: b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584:
path_to: 
revision_to: 

commit b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584
Author: Federico G. Schwindt 
Date:   Tue Aug 13 18:06:34 2013 +0100

    Use _IRC_ARGC_BETWEEN_OR_RETURN_ when possible

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c

--- 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]);

-----END OF PAGE-----