Use _IRC_ARGC_BETWEEN_OR_RETURN_ when possible

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index 0978a19dfb30f9afcc1c2f937798a44be6f82a89..78332ea113e7706abb3d97bf35e26ff121adba87 100644 (file)
--- 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);
 
        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"? */
        _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);
 
        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 */
        _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_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]);
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        chan = Channel_Search(Req->argv[0]);