From 5dd6b4e97d9c63172fac90a5b2b7167214b4ba64 Mon Sep 17 00:00:00 2001 From: brain Date: Tue, 7 Mar 2006 11:55:22 +0000 Subject: Tidying, strlen, strcasecmp where not needed. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3513 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/cmd_kick.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/cmd_kick.cpp') diff --git a/src/cmd_kick.cpp b/src/cmd_kick.cpp index 1a3138ed7..5c272112c 100644 --- a/src/cmd_kick.cpp +++ b/src/cmd_kick.cpp @@ -41,39 +41,32 @@ using namespace std; void cmd_kick::Handle (char **parameters, int pcnt, userrec *user) { + char reason[MAXKICK]; + chanrec* Ptr = FindChan(parameters[0]); userrec* u = Find(parameters[1]); - if ((!u) || (!Ptr)) + if (!u || !Ptr) { WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, u ? parameters[0] : parameters[1]); return; } - if ((IS_LOCAL(user)) && (!has_channel(user,Ptr)) && (!is_uline(user->server))) { WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, parameters[0]); return; } - - char reason[MAXBUF]; - + if (pcnt > 2) { - strlcpy(reason,parameters[2],MAXBUF); - if (strlen(reason)>MAXKICK) - { - reason[MAXKICK-1] = '\0'; - } - + strlcpy(reason,parameters[2],MAXKICK-1); kick_channel(user,u,Ptr,reason); } else { - strlcpy(reason,user->nick,MAXBUF); + strlcpy(reason,user->nick,MAXKICK-1); kick_channel(user,u,Ptr,reason); } - } -- cgit v1.3.1-10-gc9f91