IRC_SetPenalty(): Code cleanup

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index 526e2fb694bdf948ccf957f6fafb9a8ca5571d25..25cecaff8e90c13e350189dad7e39db2883c0932 100644 (file)
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -538,24 +538,27 @@ va_dcl
 /**
  * Set a "penalty time" for an IRC client.
  *
- * Note: penalty times are never set for server links!
+ * Note: penalty times are never set for server links or remote clients!
  *
  * @param Client The client.
  * @param Seconds The additional "penalty time" to enforce.
  */
 GLOBAL void
-IRC_SetPenalty( CLIENT *Client, time_t Seconds )
+IRC_SetPenalty(CLIENT *Client, time_t Seconds)
 {
        CONN_ID c;
 
-       assert( Client != NULL );
-       assert( Seconds > 0 );
+       assert(Client != NULL);
+       assert(Seconds > 0);
+
+       if (Client_Type(Client) == CLIENT_SERVER)
+               return;
 
-       if( Client_Type( Client ) == CLIENT_SERVER ) return;
+       c = Client_Conn(Client);
+       if (c <= NONE)
+               return;
 
-       c = Client_Conn( Client );
-       if (c > NONE)
-               Conn_SetPenalty(c, Seconds);
+       Conn_SetPenalty(c, Seconds);
 } /* IRC_SetPenalty */
 
 static const char *