diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-05-04 21:37:36 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-05-04 21:37:36 +0000 |
| commit | ffbd1eebf0b82bf40482879f410f58874030a695 (patch) | |
| tree | ef64846a1dcc27e8768723e30b5c4891f64e2942 /src/commands/cmd_kick.cpp | |
| parent | 1c0efd2f569ebcb725d361d3b9a8e31532f7a071 (diff) | |
Conversion of command handler params from "const char* const* parameters, int pcnt" to "const std::vector<std::string>& parameters". All of core is converted, but cant test it till the modules are converted.
IMPORTANT: The mode parser public calls have had to be tweaked a bit to also use the string vector. Note that this makes a LOT of our core a bit messy and paves the way to convert a lot of stuff from the mess
of .c_str() calls to using std::string params directly.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9608 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/commands/cmd_kick.cpp')
| -rw-r--r-- | src/commands/cmd_kick.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp index 9cf4f8b5c..e4acbbbf1 100644 --- a/src/commands/cmd_kick.cpp +++ b/src/commands/cmd_kick.cpp @@ -21,30 +21,30 @@ 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]; 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, parameters.size(), 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, 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, parameters[0].c_str()); return CMD_FAILURE; } - if (pcnt > 2) + if (parameters.size() > 2) { - strlcpy(reason, parameters[2], MAXKICK - 1); + strlcpy(reason, parameters[2].c_str(), MAXKICK - 1); } else { |