Rework check for number of parameters

[ngircd-alex.git] / src / ngircd / irc-info.c

diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c
index 6013fa0c1bff4a6640a096a7fbb729c16fcbb335..88455c74d9e85c770442aea1aa6f0c54e2e0ab9c 100644 (file)
--- a/src/ngircd/irc-info.c
+++ b/src/ngircd/irc-info.c
@@ -501,7 +501,6 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
@@ -546,7 +545,6 @@ IRC_INFO(CLIENT * Client, REQUEST * Req)
 
        IRC_SetPenalty(Client, 2);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
@@ -596,8 +594,6 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-
        strlcpy(rpl, RPL_ISON_MSG, sizeof rpl);
        for (i = 0; i < Req->argc; i++) {
                /* "All" ircd even parse ":<x> <y> ..." arguments and split
@@ -636,7 +632,6 @@ IRC_LINKS(CLIENT *Client, REQUEST *Req)
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
 
        /* Get pointer to server mask or "*", if none given */
@@ -691,7 +686,6 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
@@ -718,12 +712,10 @@ IRC_SERVLIST(CLIENT *Client, REQUEST *Req)
 {
        CLIENT *c;
 
-       IRC_SetPenalty(Client, 1);
-
        assert(Client != NULL);
        assert(Req != NULL);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
+       IRC_SetPenalty(Client, 1);
 
        if (Req->argc < 2 || strcmp(Req->argv[1], "0") == 0) {
                for (c = Client_First(); c!= NULL; c = Client_Next(c)) {
@@ -762,7 +754,6 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 3);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
 
@@ -795,7 +786,6 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
@@ -881,7 +871,6 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 2);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 1, from)
 
@@ -1020,7 +1009,6 @@ IRC_TIME( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(from, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, from)
 
@@ -1056,8 +1044,6 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req)
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_GE_OR_RETURN_(Client, Req, 1)
-
        if (Req->argc > 5)
                max = 5;
        else
@@ -1120,7 +1106,6 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 1)
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 0, prefix)
 
@@ -1156,8 +1141,6 @@ IRC_WHO(CLIENT *Client, REQUEST *Req)
 
        IRC_SetPenalty(Client, 1);
 
-       _IRC_ARGC_LE_OR_RETURN_(Client, Req, 2)
-
        only_ops = false;
        if (Req->argc == 2) {
                if (strcmp(Req->argv[1], "o") == 0)
@@ -1317,10 +1300,6 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Do not reveal any info on disconnected users? */
-       if (Conf_MorePrivacy)
-               return CONNECTED;
-
        /* Wrong number of parameters? */
        if (Req->argc < 1)
                return IRC_WriteErrClient(Client, ERR_NONICKNAMEGIVEN_MSG,
@@ -1330,6 +1309,10 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
        _IRC_GET_SENDER_OR_RETURN_(prefix, Req, Client)
        _IRC_GET_TARGET_SERVER_OR_RETURN_(target, Req, 2, prefix)
 
+       /* Do not reveal any info on disconnected users? */
+       if (Conf_MorePrivacy)
+               return CONNECTED;
+
        /* Forward? */
        if (target != Client_ThisServer()) {
                IRC_WriteStrClientPrefix(target, prefix, "WHOWAS %s %s %s",