From ffbd1eebf0b82bf40482879f410f58874030a695 Mon Sep 17 00:00:00 2001 From: brain Date: Sun, 4 May 2008 21:37:36 +0000 Subject: Conversion of command handler params from "const char* const* parameters, int pcnt" to "const std::vector& 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 --- src/commands/cmd_join.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/commands/cmd_join.cpp') diff --git a/src/commands/cmd_join.cpp b/src/commands/cmd_join.cpp index d34409e7c..e7c841399 100644 --- a/src/commands/cmd_join.cpp +++ b/src/commands/cmd_join.cpp @@ -21,31 +21,31 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /JOIN */ -CmdResult CommandJoin::Handle (const char* const* parameters, int pcnt, User *user) +CmdResult CommandJoin::Handle (const std::vector& parameters, User *user) { - if (pcnt > 1) + if (parameters.size() > 1) { - if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0, 1)) + if (ServerInstance->Parser->LoopCall(user, this, parameters, 0, 1)) return CMD_SUCCESS; - if (ServerInstance->IsChannel(parameters[0])) + if (ServerInstance->IsChannel(parameters[0].c_str())) { - Channel::JoinUser(ServerInstance, user, parameters[0], false, parameters[1], false); + Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), false, parameters[1].c_str(), false); return CMD_SUCCESS; } } else { - if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) + if (ServerInstance->Parser->LoopCall(user, this, parameters, 0)) return CMD_SUCCESS; - if (ServerInstance->IsChannel(parameters[0])) + if (ServerInstance->IsChannel(parameters[0].c_str())) { - Channel::JoinUser(ServerInstance, user, parameters[0], false, "", false); + Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), false, "", false); return CMD_SUCCESS; } } - user->WriteNumeric(403, "%s %s :Invalid channel name",user->nick, parameters[0]); + user->WriteNumeric(403, "%s %s :Invalid channel name",user->nick, parameters[0].c_str()); return CMD_FAILURE; } -- cgit v1.3.1-10-gc9f91