More numerics.h conversion

[user/henk/code/inspircd.git] / src / commands / cmd_kick.cpp

diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index 9cf4f8b5c390062d04fe1924008c9612a10d8c56..a0ff5d1c3e64fd6d469f29b85b03547f9375499d 100644 (file)
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -21,37 +21,37 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
 
 /** Handle /KICK
  */
-CmdResult CommandKick::Handle (const char* const* parameters, int pcnt, User *user)
+CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       char reason[MAXKICK];
+       std::string reason;
        Channel* c = ServerInstance->FindChan(parameters[0]);
        User* u = ServerInstance->FindNick(parameters[1]);
 
-       if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 1))
+       if (ServerInstance->Parser->LoopCall(user, this, parameters, 1))
                return CMD_SUCCESS;
 
        if (!u || !c)
        {
-               user->WriteServ( "401 %s %s :No such nick/channel", user->nick, u ? parameters[0] : parameters[1]);
+               user->WriteServ( "401 %s %s :No such nick/channel", user->nick.c_str(), u ? parameters[0].c_str() : parameters[1].c_str());
                return CMD_FAILURE;
        }
 
        if ((IS_LOCAL(user)) && (!c->HasUser(user)) && (!ServerInstance->ULine(user->server)))
        {
-               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick, parameters[0]);
+               user->WriteServ( "442 %s %s :You're not on that channel!", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 
-       if (pcnt > 2)
+       if (parameters.size() > 2)
        {
-               strlcpy(reason, parameters[2], MAXKICK - 1);
+               reason.assign(parameters[2], 0, ServerInstance->Config->Limits.MaxKick);
        }
        else
        {
-               strlcpy(reason, user->nick, MAXKICK - 1);
+               reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
        }
 
-       if (!c->KickUser(user, u, reason))
+       if (!c->KickUser(user, u, reason.c_str()))
                /* Nobody left here, delete the Channel */
                delete c;