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_kline.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/commands/cmd_kline.cpp') diff --git a/src/commands/cmd_kline.cpp b/src/commands/cmd_kline.cpp index b4464a6d3..ddf5d218b 100644 --- a/src/commands/cmd_kline.cpp +++ b/src/commands/cmd_kline.cpp @@ -22,11 +22,11 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /KLINE */ -CmdResult CommandKline::Handle (const char* const* parameters, int pcnt, User *user) +CmdResult CommandKline::Handle (const std::vector& parameters, User *user) { std::string target = parameters[0]; - if (pcnt >= 3) + if (parameters.size() >= 3) { IdentHostPair ih; User* find = ServerInstance->FindNick(target.c_str()); @@ -48,14 +48,14 @@ CmdResult CommandKline::Handle (const char* const* parameters, int pcnt, User *u if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user)) return CMD_FAILURE; - if (strchr(target.c_str(),'!')) + if (target.find('!') != std::string::npos) { user->WriteServ("NOTICE %s :*** K-Line cannot operate on nick!user@host masks",user->nick); return CMD_FAILURE; } - long duration = ServerInstance->Duration(parameters[1]); - KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ih.first.c_str(), ih.second.c_str()); + long duration = ServerInstance->Duration(parameters[1].c_str()); + KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), ih.first.c_str(), ih.second.c_str()); if (ServerInstance->XLines->AddLine(kl,user)) { if (!duration) -- cgit v1.2.3