Module: ngircd.git Branch: master Commit: 131364def157263d1416e559636593a4daaca72a URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=13136...

Author: Alexander Barton alex@barton.de Date: Sat Sep 7 00:05:49 2013 +0200

IRC_SetPenalty(): Code cleanup

---

src/ngircd/irc-write.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index 526e2fb..25cecaf 100644 --- 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 *