X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-channel.c;h=0421d9170201b9d7d81f26d6b61feea4ee584c2d;hb=925b4de2981b55a279f28368446f0a862c621d5e;hp=b286b5ac3df4cf705b18dc63b695209268083d5d;hpb=eccbd97e1f2599bfb76818fe6bc32967ed07e0c7;p=ngircd-alex.git diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index b286b5ac..0421d917 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -323,11 +323,9 @@ IRC_JOIN( CLIENT *Client, REQUEST *Req ) channame = strtok_r(channame, ",", &lastchan); /* Make sure that "channame" is not the empty string ("JOIN :") */ - if (!channame) { - IRC_SetPenalty(Client, 2); + if (!channame) return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); - } while (channame) { flags = NULL; @@ -447,11 +445,9 @@ IRC_PART(CLIENT * Client, REQUEST * Req) chan = strtok(Req->argv[0], ","); /* Make sure that "chan" is not the empty string ("PART :") */ - if (!chan) { - IRC_SetPenalty(Client, 2); + if (!chan) return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); - } while (chan) { Channel_Part(target, Client, chan, @@ -669,11 +665,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); /* Bad number of parameters? */ - if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) { - IRC_SetPenalty(Client, 2); + if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) return IRC_WriteErrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command); - } /* Compatibility kludge */ if (Req->argc == 5)