X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-write.c;h=5503344d1aa58702e89b4197d29729d64d357743;hb=a4ed90ba9af1dce4df3f57f6a7c84097000c7256;hp=526e2fb694bdf948ccf957f6fafb9a8ca5571d25;hpb=904c8a4375cb9deed64007b06c6a7ba42313d93d;p=ngircd-alex.git

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index 526e2fb6..5503344d 100644
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -70,7 +70,7 @@ va_dcl
 #else
 	va_start(ap);
 #endif
-	vsnprintf(buffer, 1000, Format, ap);
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end(ap);
 
 	IRC_SetPenalty(Client, 2);
@@ -107,7 +107,7 @@ va_dcl
 #else
 	va_start(ap);
 #endif
-	vsnprintf(buffer, 1000, Format, ap);
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end(ap);
 
 	return IRC_WriteStrClientPrefix(Client, Client_ThisServer(),
@@ -148,7 +148,7 @@ va_dcl
 #else
 	va_start( ap );
 #endif
-	vsnprintf( buffer, 1000, Format, ap );
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end( ap );
 
 	return Conn_WriteStr(Client_Conn(Client_NextHop(Client)), ":%s %s",
@@ -190,7 +190,7 @@ va_dcl
 #else
 	va_start( ap );
 #endif
-	vsnprintf( buffer, 1000, Format, ap );
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end( ap );
 
 	IRC_WriteStrChannelPrefix(Client, Chan, Client_ThisServer(),
@@ -239,7 +239,7 @@ va_dcl
 #else
 	va_start( ap  );
 #endif
-	vsnprintf( buffer, 1000, Format, ap );
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end( ap );
 
 	Conn_ClearFlags( );
@@ -296,7 +296,7 @@ va_dcl
 #else
 	va_start( ap );
 #endif
-	vsnprintf( buffer, 1000, Format, ap );
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end( ap );
 
 	IRC_WriteStrServersPrefix(ExceptOf, Client_ThisServer(), "%s", buffer);
@@ -333,7 +333,7 @@ va_dcl
 #else
 	va_start( ap );
 #endif
-	vsnprintf( buffer, 1000, Format, ap );
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end( ap );
 
 	IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, '\0', "%s", buffer );
@@ -373,7 +373,7 @@ va_dcl
 #else
 	va_start( ap );
 #endif
-	vsnprintf( buffer, 1000, Format, ap );
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end( ap );
 
 	IRC_WriteStrServersPrefixFlag_CB(ExceptOf, Prefix, Flag,
@@ -451,7 +451,7 @@ va_dcl
 #else
 	va_start( ap );
 #endif
-	vsnprintf( buffer, 1000, Format, ap );
+	vsnprintf(buffer, sizeof(buffer), Format, ap);
 	va_end( ap );
 
 	Conn_ClearFlags( );
@@ -513,7 +513,7 @@ va_dcl
 #else
 	va_start(ap);
 #endif
-	vsnprintf(msg, 1000, Format, ap);
+	vsnprintf(msg, sizeof(msg), Format, ap);
 	va_end(ap);
 
 	for (to=Client_First(); to != NULL; to=Client_Next(to)) {
@@ -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 *