Fix an shadowing warning in the spanningtree module.

[user/henk/code/inspircd.git] / src / modules / m_globalload.cpp

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 294187fa5c81bea51b6b8d775c0c72fa374861ac..8bd63a065ace10acd606672786e5315b556807a5 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -32,10 +32,10 @@ class CommandGloadmodule : public Command
        CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1)
        {
                flags_needed = 'o';
-               syntax = "<modulename> [servermask]";
+               syntax = "<modulename> [<servermask>]";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
@@ -44,11 +44,11 @@ class CommandGloadmodule : public Command
                        if (ServerInstance->Modules->Load(parameters[0].c_str()))
                        {
                                ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-                               user->WriteNumeric(RPL_LOADEDMODULE, "%s :Module successfully loaded.", parameters[0].c_str());
+                               user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
                        }
                        else
                        {
-                               user->WriteNumeric(ERR_CANTLOADMODULE, "%s :%s", parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
                        }
                }
                else
@@ -57,7 +57,7 @@ class CommandGloadmodule : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }
@@ -71,15 +71,15 @@ class CommandGunloadmodule : public Command
        CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1)
        {
                flags_needed = 'o';
-               syntax = "<modulename> [servermask]";
+               syntax = "<modulename> [<servermask>]";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") &&
                        InspIRCd::Match(parameters[0], "core_*.so", ascii_case_insensitive_map))
                {
-                       user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :You cannot unload core commands!", parameters[0].c_str());
+                       user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
                        return CMD_FAILURE;
                }
 
@@ -93,16 +93,15 @@ class CommandGunloadmodule : public Command
                                if (ServerInstance->Modules->Unload(m))
                                {
                                        ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-                                       user->SendText(":%s 973 %s %s :Module successfully unloaded.",
-                                               ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+                                       user->WriteRemoteNumeric(RPL_UNLOADEDMODULE, parameters[0], "Module successfully unloaded.");
                                }
                                else
                                {
-                                       user->WriteNumeric(ERR_CANTUNLOADMODULE, "%s :%s", parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                                       user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules->LastError());
                                }
                        }
                        else
-                               user->SendText(":%s %03d %s %s :No such module", ServerInstance->Config->ServerName.c_str(), ERR_CANTUNLOADMODULE, user->nick.c_str(), parameters[0].c_str());
+                               user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "No such module");
                }
                else
                        ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
@@ -110,7 +109,7 @@ class CommandGunloadmodule : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }
@@ -123,10 +122,10 @@ class CommandGreloadmodule : public Command
  public:
        CommandGreloadmodule(Module* Creator) : Command(Creator, "GRELOADMODULE", 1)
        {
-               flags_needed = 'o'; syntax = "<modulename> [servermask]";
+               flags_needed = 'o'; syntax = "<modulename> [<servermask>]";
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
@@ -140,7 +139,7 @@ class CommandGreloadmodule : public Command
                        }
                        else
                        {
-                               user->WriteNumeric(RPL_LOADEDMODULE, "%s :Could not find module by that name", parameters[0].c_str());
+                               user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
                                return CMD_FAILURE;
                        }
                }
@@ -150,7 +149,7 @@ class CommandGreloadmodule : public Command
                return CMD_SUCCESS;
        }
 
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                return ROUTE_BROADCAST;
        }
@@ -170,7 +169,7 @@ class ModuleGlobalLoad : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR);
+               return Version("Allows global loading of a module", VF_COMMON | VF_VENDOR);
        }
 };