cmd_invite Extend scope of the prefix character variable

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 9e653a4aba1460560f67a79dac1f2a54fb8a483c..d77221c39f847b975f7c0af38c1c47ee635d3782 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -451,26 +451,6 @@ namespace
                        ServerInstance->GlobalCulls.AddItem(this);
                }
        };
-
-       struct ReloadAction : public HandlerBase0<void>
-       {
-               Module* const mod;
-               HandlerBase1<void, bool>* const callback;
-               ReloadAction(Module* m, HandlerBase1<void, bool>* c)
-                       : mod(m), callback(c) {}
-               void Call()
-               {
-                       DLLManager* dll = mod->ModuleDLLManager;
-                       std::string name = mod->ModuleSourceFile;
-                       ServerInstance->Modules->DoSafeUnload(mod);
-                       ServerInstance->GlobalCulls.Apply();
-                       delete dll;
-                       bool rv = ServerInstance->Modules->Load(name);
-                       if (callback)
-                               callback->Call(rv);
-                       ServerInstance->GlobalCulls.AddItem(this);
-               }
-       };
 }
 
 bool ModuleManager::Unload(Module* mod)
@@ -481,14 +461,6 @@ bool ModuleManager::Unload(Module* mod)
        return true;
 }
 
-void ModuleManager::Reload(Module* mod, HandlerBase1<void, bool>* callback)
-{
-       if (CanUnload(mod))
-               ServerInstance->AtomicActions.AddAction(new ReloadAction(mod, callback));
-       else if (callback)
-               callback->Call(false);
-}
-
 void ModuleManager::LoadAll()
 {
        std::map<std::string, ServiceList> servicemap;
@@ -556,22 +528,6 @@ void ModuleManager::AddService(ServiceProvider& item)
 {
        switch (item.service)
        {
-               case SERVICE_COMMAND:
-                       if (!ServerInstance->Parser.AddCommand(static_cast<Command*>(&item)))
-                               throw ModuleException("Command "+std::string(item.name)+" already exists.");
-                       return;
-               case SERVICE_MODE:
-               {
-                       ModeHandler* mh = static_cast<ModeHandler*>(&item);
-                       ServerInstance->Modes->AddMode(mh);
-                       DataProviders.insert(std::make_pair((mh->GetModeType() == MODETYPE_CHANNEL ? "mode/" : "umode/") + item.name, &item));
-                       dynamic_reference_base::reset_all();
-                       return;
-               }
-               case SERVICE_METADATA:
-                       if (!ServerInstance->Extensions.Register(static_cast<ExtensionItem*>(&item)))
-                               throw ModuleException("Extension " + std::string(item.name) + " already exists.");
-                       return;
                case SERVICE_DATA:
                case SERVICE_IOHOOK:
                {
@@ -589,7 +545,7 @@ void ModuleManager::AddService(ServiceProvider& item)
                        return;
                }
                default:
-                       throw ModuleException("Cannot add unknown service type");
+                       item.RegisterService();
        }
 }
 
@@ -604,13 +560,7 @@ void ModuleManager::DelService(ServiceProvider& item)
                case SERVICE_DATA:
                case SERVICE_IOHOOK:
                {
-                       for(std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
-                       {
-                               std::multimap<std::string, ServiceProvider*>::iterator curr = i++;
-                               if (curr->second == &item)
-                                       DataProviders.erase(curr);
-                       }
-                       dynamic_reference_base::reset_all();
+                       DelReferent(&item);
                        return;
                }
                default:
@@ -702,3 +652,22 @@ Module* ModuleManager::Find(const std::string &name)
        else
                return modfind->second;
 }
+
+void ModuleManager::AddReferent(const std::string& name, ServiceProvider* service)
+{
+       DataProviders.insert(std::make_pair(name, service));
+       dynamic_reference_base::reset_all();
+}
+
+void ModuleManager::DelReferent(ServiceProvider* service)
+{
+       for (std::multimap<std::string, ServiceProvider*>::iterator i = DataProviders.begin(); i != DataProviders.end(); )
+       {
+               ServiceProvider* curr = i->second;
+               if (curr == service)
+                       DataProviders.erase(i++);
+               else
+                       ++i;
+       }
+       dynamic_reference_base::reset_all();
+}