commit 68d3d36dd6b8c286aa79768ce69ddebb9bf6e7f6 from: Florian Westphal date: Thu Mar 16 19:56:34 2006 UTC removed silly if (foo) { if (foo){ }} statement commit - eedfc35bbccfe1385f3ba15fd1c0e577f9e07299 commit + 68d3d36dd6b8c286aa79768ce69ddebb9bf6e7f6 blob - ab93185a9c4e1c6adfff933e1f6c214b681b3c71 blob + 30a7d642df3424c8248a6db125c52e7280a8de73 --- src/ngircd/irc-channel.c +++ src/ngircd/irc-channel.c @@ -14,7 +14,7 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-channel.c,v 1.33 2005/09/05 08:11:11 alex Exp $"; +static char UNUSED id[] = "$Id: irc-channel.c,v 1.34 2006/03/16 19:56:34 fw Exp $"; #include "imp.h" #include @@ -97,13 +97,10 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) if( Client_Type( Client ) == CLIENT_USER ) { /* Test if the user has reached his maximum channel count */ - if( Client_Type( Client ) == CLIENT_USER ) - { - if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins )) - { - IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, Client_ID( Client ), channame ); - return CONNECTED; - } + if(( Conf_MaxJoins > 0 ) && ( Channel_CountForUser( Client ) >= Conf_MaxJoins )) { + IRC_WriteStrClient( Client, ERR_TOOMANYCHANNELS_MSG, + Client_ID( Client ), channame ); + return CONNECTED; } /* Existiert der Channel bereits, oder wird er im Moment neu erzeugt? */