X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=7c18c8ab19cd8cb772bac95d3eddeecc479f34ca;hb=4d42d544584875d0d71dab99f6785ac98324b971;hp=f427b478c6fc027ad3f263b406c3541ba7c7125a;hpb=187544bfd00c340492924f8238109ff7929c555d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index f427b478c..7c18c8ab1 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -69,10 +69,10 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector dupes; + std::set dupes; /* Create two lists, one for channel names, one for keys */ @@ -103,7 +103,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorHandle(new_parameters, user); - dupes[item.c_str()] = true; + dupes.insert(item.c_str()); } } return 1; @@ -120,7 +120,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector dupes; + std::set dupes; /* Only one commasepstream here */ irc::commasepstream items1(parameters[splithere]); @@ -145,7 +145,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorHandle(new_parameters, user); - dupes[item.c_str()] = true; + dupes.insert(item.c_str()); } } /* By returning 1 we tell our caller that nothing is to be done, @@ -262,10 +262,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) command_p.push_back(token); std::transform(command.begin(), command.end(), command.begin(), ::toupper); - + /* find the command, check it exists */ Commandtable::iterator cm = cmdlist.find(command); - + if (cm == cmdlist.end()) { int MOD_RESULT = 0; @@ -310,7 +310,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) { // BE CAREFUL: .end() returns past the end of the vector, hence decrement. std::vector::iterator it = --command_p.end(); - + lparam.insert(0, " " + *(it)); command_p.erase(it); // remove last element } @@ -679,5 +679,3 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st return translations; } - -