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_zline.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/commands/cmd_zline.cpp') diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp index c4bc750c7..c1951d447 100644 --- a/src/commands/cmd_zline.cpp +++ b/src/commands/cmd_zline.cpp @@ -22,15 +22,15 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandZline(Instance); } -CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *user) +CmdResult CommandZline::Handle (const std::vector& parameters, User *user) { std::string target = parameters[0]; - if (pcnt >= 3) + if (parameters.size() >= 3) { - if (strchr(target.c_str(),'@') || strchr(target.c_str(),'!')) + if (target.find('!') != std::string::npos) { - user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick); + user->WriteServ("NOTICE %s :*** You cannot include a nickname in a zline, a zline must ban only an IP mask",user->nick); return CMD_FAILURE; } @@ -44,7 +44,7 @@ CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *u if (ServerInstance->IPMatchesEveryone(target.c_str(),user)) return CMD_FAILURE; - long duration = ServerInstance->Duration(parameters[1]); + long duration = ServerInstance->Duration(parameters[1].c_str()); const char* ipaddr = target.c_str(); User* find = ServerInstance->FindNick(target.c_str()); @@ -62,7 +62,7 @@ CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *u ipaddr++; } } - ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], ipaddr); + ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2].c_str(), ipaddr); if (ServerInstance->XLines->AddLine(zl,user)) { if (!duration) -- cgit v1.2.3