Commit Diff

Commit:
b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584
From:
Federico G. Schwindt <fgsch@lodoss.net>
Date:
Message:
Use _IRC_ARGC_BETWEEN_OR_RETURN_ when possible
Actions:
Patch | Tree
commit - 4828bae8d321c6a87a724092ef0f258db7cd7e50
commit + b081cfb628d8a1d8d8c9c8eec7606ad0e3ff8584
blob - 0978a19dfb30f9afcc1c2f937798a44be6f82a89
blob + 78332ea113e7706abb3d97bf35e26ff121adba87
--- src/ngircd/irc-channel.c
+++ 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]);