repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 131364def157263d1416e559636593a4daaca72a:
path_to: 
revision_to: 

commit 131364def157263d1416e559636593a4daaca72a
Author: Alexander Barton 
Date:   Sat Sep 7 00:05:49 2013 +0200

    IRC_SetPenalty(): Code cleanup

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c

--- 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 *

-----END OF PAGE-----