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_invite.cpp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'src/commands/cmd_invite.cpp') diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp index 553915ac9..db1c64eac 100644 --- a/src/commands/cmd_invite.cpp +++ b/src/commands/cmd_invite.cpp @@ -21,31 +21,23 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /INVITE */ -CmdResult CommandInvite::Handle (const char* const* parameters, int pcnt, User *user) +CmdResult CommandInvite::Handle (const std::vector& parameters, User *user) { int MOD_RESULT = 0; - if (pcnt == 2 || pcnt == 3) + if (parameters.size() == 2 || parameters.size() == 3) { User* u = ServerInstance->FindNick(parameters[0]); Channel* c = ServerInstance->FindChan(parameters[1]); time_t timeout = 0; - if (pcnt == 3) + if (parameters.size() == 3) { timeout = time(NULL) + ServerInstance->Duration(parameters[2]); } if ((!c) || (!u)) { - if (!c) - { - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[1]); - } - else - { - user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, parameters[0]); - } - + user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, c ? parameters[0].c_str() : parameters[1].c_str()); return CMD_FAILURE; } -- cgit v1.2.3