Replace std::deque with std::vector in spanningtree and related modules

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index e5eef4499f18c6fff6fc02a49f4408a87266db46..b446d2b9af9224a8e1f6effc686772087443ab4c 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -266,6 +266,16 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        /* find the command, check it exists */
        Commandtable::iterator cm = cmdlist.find(command);
 
+       /* Modify the user's penalty regardless of whether or not the command exists */
+       bool do_more = true;
+       if (!user->HasPrivPermission("users/flood/no-throttle"))
+       {
+               // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
+               user->IncreasePenalty(cm != cmdlist.end() ? cm->second->Penalty : 2);
+               do_more = (user->Penalty < 10);
+       }
+
+
        if (cm == cmdlist.end())
        {
                int MOD_RESULT = 0;
@@ -336,14 +346,6 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        if (MOD_RESULT == 1)
                return true;
 
-       /* Modify the user's penalty */
-       bool do_more = true;
-       if (!user->HasPrivPermission("users/flood/no-throttle"))
-       {
-               user->IncreasePenalty(cm->second->Penalty);
-               do_more = (user->Penalty < 10);
-       }
-
        /* activity resets the ping pending timer */
        if (user->MyClass)
                user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
@@ -429,7 +431,6 @@ void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* sour
        if (x->source == std::string(source))
        {
                cmdlist.erase(safei);
-               delete x;
        }
 }
 
@@ -506,11 +507,11 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user)
                cmdlist.erase(cmdlist.find(cmd));
 
                RFCCommands.erase(cmd);
-               std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
                delete cmdptr;
                dlclose(command->second);
        }
 
+       std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
        snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str());
        const char* err = this->LoadCommand(filename);
        if (err)
@@ -531,12 +532,12 @@ CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User
        if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
        {
                user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str());
-               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('a', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
                return CMD_SUCCESS;
        }
        else
        {
-               user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str());
+               user->WriteServ("NOTICE %s :*** Could not reload command '%s'. The command will not work until reloaded successfully.", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 }
@@ -606,10 +607,10 @@ void CommandParser::SetupCommandTable()
                this->CreateCommand(new CommandReload(ServerInstance));
 }
 
-int CommandParser::TranslateUIDs(const std::deque<TranslateType> to, const std::deque<std::string> &source, std::string &dest)
+int CommandParser::TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest)
 {
-       std::deque<std::string>::const_iterator items = source.begin();
-       std::deque<TranslateType>::const_iterator types = to.begin();
+       std::vector<std::string>::const_iterator items = source.begin();
+       std::vector<TranslateType>::const_iterator types = to.begin();
        User* user = NULL;
        int translations = 0;
        dest.clear();