Remove unneded IRC_SetPenalty() calls

IRC_WriteErrClient() already calls IRC_SetPenalty().  While here convert
some IRC_SetPenalty() + IRC_WriteStrClient() to IRC_WriteErrClient().

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index b286b5ac3df4cf705b18dc63b695209268083d5d..0421d9170201b9d7d81f26d6b61feea4ee584c2d 100644 (file)
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -323,11 +323,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req )
        channame = strtok_r(channame, ",", &lastchan);
 
        /* Make sure that "channame" is not the empty string ("JOIN :") */
-       if (!channame) {
-               IRC_SetPenalty(Client, 2);
+       if (!channame)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        while (channame) {
                flags = NULL;
@@ -447,11 +445,9 @@ IRC_PART(CLIENT * Client, REQUEST * Req)
        chan = strtok(Req->argv[0], ",");
 
        /* Make sure that "chan" is not the empty string ("PART :") */
-       if (!chan) {
-               IRC_SetPenalty(Client, 2);
+       if (!chan)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        while (chan) {
                Channel_Part(target, Client, chan,
@@ -669,11 +665,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
        assert( Req != NULL );
 
        /* Bad number of parameters? */
-       if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) {
-               IRC_SetPenalty(Client, 2);
+       if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        /* Compatibility kludge */
        if (Req->argc == 5)

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 469527209ac2dfdf423014c26fc3d4b0a116104a..9e7e2d7a9a9a21a9beb4584748f6cd05628966b4 100644 (file)
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -80,7 +80,6 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
        } else if (Client_Type(Client) == CLIENT_UNKNOWN ||
                   Client_Type(Client) == CLIENT_UNKNOWNSERVER) {
                /* Unregistered connection, but wrong number of arguments: */
-               IRC_SetPenalty(Client, 2);
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
        } else {
@@ -274,11 +273,9 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
                /* Server or service introduces new client */
 
                /* Bad number of parameters? */
-               if (Req->argc != 2 && Req->argc != 7) {
-                       IRC_SetPenalty(Client, 2);
+               if (Req->argc != 2 && Req->argc != 7)
                        return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                                  Client_ID(Client), Req->command);
-               }
 
                if (Req->argc >= 7) {
                        /* RFC 2813 compatible syntax */
@@ -375,10 +372,9 @@ IRC_SVSNICK(CLIENT *Client, REQUEST *Req)
 
        /* Search the target */
        target = Client_Search(Req->argv[0]);
-       if (!target || Client_Type(target) != CLIENT_USER) {
+       if (!target || Client_Type(target) != CLIENT_USER)
                return IRC_WriteErrClient(Client, ERR_NOSUCHNICK_MSG,
                                          Client_ID(Client), Req->argv[0]);
-       }
 
        if (Client_Conn(target) <= NONE) {
                /* We have to forward the message to the server handling

diff --git a/src/ngircd/irc-macros.h b/src/ngircd/irc-macros.h
index 07ccfd284323760cade3616a9a53f8f7aa40426c..5a7ec639ba4a935b5281a5a9181d66feeb8ac250 100644 (file)
--- a/src/ngircd/irc-macros.h
+++ b/src/ngircd/irc-macros.h
@@ -25,8 +25,7 @@
  */
 #define _IRC_ARGC_EQ_OR_RETURN_(Client, Req, Count) \
 if (Req->argc != Count) { \
-       IRC_SetPenalty(Client, 2); \
-       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
                                  Client_ID(Client), Req->command); \
 }
 
@@ -38,8 +37,7 @@ if (Req->argc != Count) { \
  */
 #define _IRC_ARGC_LE_OR_RETURN_(Client, Req, Max) \
 if (Req->argc > Max) { \
-       IRC_SetPenalty(Client, 2); \
-       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
                                  Client_ID(Client), Req->command); \
 }
 
@@ -51,8 +49,7 @@ if (Req->argc > Max) { \
  */
 #define _IRC_ARGC_GE_OR_RETURN_(Client, Req, Min) \
 if (Req->argc < Min) { \
-       IRC_SetPenalty(Client, 2); \
-       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
                                  Client_ID(Client), Req->command); \
 }
 
@@ -64,8 +61,7 @@ if (Req->argc < Min) { \
  */
 #define _IRC_ARGC_BETWEEN_OR_RETURN_(Client, Req, Min, Max) \
 if (Req->argc < Min || Req->argc > Max) { \
-       IRC_SetPenalty(Client, 2); \
-       return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
+       return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, \
                                  Client_ID(Client), Req->command); \
 }
 

diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c
index af59683a744740baae7cae3ebec1dd3b22ef91c9..8e76db17084461f8c6c971bbd79b9858cd0c8c3e 100644 (file)
--- a/src/ngircd/irc-mode.c
+++ b/src/ngircd/irc-mode.c
@@ -613,7 +613,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 #ifdef STRICT_RFC
                                /* Only send error message in "strict" mode,
                                 * this is how ircd2.11 and others behave ... */
-                               IRC_SetPenalty(Origin, 2);
                                connected = IRC_WriteErrClient(Origin,
                                        ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Origin), Req->command);
@@ -658,7 +657,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
 #ifdef STRICT_RFC
                                /* Only send error message in "strict" mode,
                                 * this is how ircd2.11 and others behave ... */
-                               IRC_SetPenalty(Origin, 2);
                                connected = IRC_WriteErrClient(Origin,
                                        ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Origin), Req->command);
@@ -760,7 +758,6 @@ Channel_Mode(CLIENT *Client, REQUEST *Req, CLIENT *Origin, CHANNEL *Channel)
                                 * mode, because most other servers don't do
                                 * it as well and some clients send "wired"
                                 * MODE commands like "MODE #chan -ooo nick". */
-                               IRC_SetPenalty(Origin, 2);
                                connected = IRC_WriteErrClient(Origin,
                                        ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Origin), Req->command);

diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c
index 52126877dc1a6f27bc804b3a968499251d36e980..23db579e725e1e54ef01faf4bfdd10616843ac76 100644 (file)
--- a/src/ngircd/irc-op.c
+++ b/src/ngircd/irc-op.c
@@ -122,7 +122,6 @@ IRC_KICK(CLIENT *Client, REQUEST *Req)
                        nickCount--;
                }
        } else {
-               IRC_SetPenalty(Client, 2);
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                        Client_ID(Client), Req->command);
        }

diff --git a/src/ngircd/irc-oper.c b/src/ngircd/irc-oper.c
index 4ccc76a6d830fdc66ead9139ad316687ea2b050e..260346c7ce6aec547731b8a0b36440f004270e8d 100644 (file)
--- a/src/ngircd/irc-oper.c
+++ b/src/ngircd/irc-oper.c
@@ -208,18 +208,14 @@ IRC_CONNECT(CLIENT * Client, REQUEST * Req)
 
        /* Bad number of parameters? */
        if (Req->argc != 1 && Req->argc != 2 && Req->argc != 3 &&
-           Req->argc != 5 && Req->argc != 6) {
-               IRC_SetPenalty(Client, 2);
+           Req->argc != 5 && Req->argc != 6)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        /* Invalid port number? */
-       if ((Req->argc > 1) && atoi(Req->argv[1]) < 1) {
-               IRC_SetPenalty(Client, 2);
+       if ((Req->argc > 1) && atoi(Req->argv[1]) < 1)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        if (Client_Type(Client) != CLIENT_SERVER
            && !Client_HasMode(Client, 'o'))
@@ -395,11 +391,9 @@ IRC_xLINE(CLIENT *Client, REQUEST *Req)
        assert(Req != NULL);
 
        /* Bad number of parameters? */
-       if (Req->argc != 1 && Req->argc != 3) {
-               IRC_SetPenalty(Client, 2);
+       if (Req->argc != 1 && Req->argc != 3)
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 
        from = Op_Check(Client, Req);
        if (!from)

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index b0abb7cdf2622cac13792c4a2c708baeeaa12e48..7dbaba86a6bc20bc70d0d59b6db9969653b234b0 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -72,12 +72,10 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                LogDebug("Connection %d: got SERVER command (new server link) ...",
                        Client_Conn(Client));
 
-               if (Req->argc != 2 && Req->argc != 3) {
-                       IRC_SetPenalty(Client, 2);
+               if (Req->argc != 2 && Req->argc != 3)
                        return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                                  Client_ID(Client),
                                                  Req->command);
-               }
 
                /* Get configuration index of new remote server ... */
                for (i = 0; i < MAX_SERVERS; i++)
@@ -185,11 +183,9 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
        {
                /* New server is being introduced to the network */
 
-               if (Req->argc != 4) {
-                       IRC_SetPenalty(Client, 2);
+               if (Req->argc != 4)
                        return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                                  Client_ID(Client), Req->command);
-               }
 
                /* check for existing server with same ID */
                if (!Client_CheckID(Client, Req->argv[0]))
@@ -235,11 +231,9 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                                          Client_MyToken(c), Client_Info(c));
 
                return CONNECTED;
-       } else {
-               IRC_SetPenalty(Client, 2);
+       } else
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
-       }
 } /* IRC_SERVER */
 
 /*

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index b2d865fc7fa381c0b8062ad6bfcde58468f8460d..35f1a59a8a06b4a6fe516948be098ea312374646 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -526,7 +526,6 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors)
        if (Req->argc > 2) {
                if (!SendErrors)
                        return CONNECTED;
-               IRC_SetPenalty(Client, 2);
                return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
        }

diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c
index 2c7ba94d5a1e793cf37b25d8c25f3e36185c96d4..52954402d9d036acc898f9a1737d9cc5c2acf691 100644 (file)
--- a/src/ngircd/parse.c
+++ b/src/ngircd/parse.c
@@ -531,11 +531,9 @@ Handle_Request( CONN_ID Idx, REQUEST *Req )
                }
 
                if (Req->argc < cmd->min_argc ||
-                   (cmd->max_argc != -1 && Req->argc > cmd->max_argc)) {
-                       IRC_SetPenalty(client, 2);
-                       return IRC_WriteStrClient(client, ERR_NEEDMOREPARAMS_MSG,
+                   (cmd->max_argc != -1 && Req->argc > cmd->max_argc))
+                       return IRC_WriteErrClient(client, ERR_NEEDMOREPARAMS_MSG,
                                                  Client_ID(client), Req->command);
-               }
 
                /* Command is allowed for this client: call it and count
                 * generated bytes in output */