Fix modules/extra symlinks when calculating dependencies

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

diff --git a/src/base.cpp b/src/base.cpp
index 1e4f746af3dd5cb7ac8f04c66060ecf860291acf..2b022688df8ebf2960973a4d58add9e43b8eda15 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -26,6 +26,14 @@ classbase::classbase()
 {
 }
 
+void classbase::cull()
+{
+}
+
+classbase::~classbase()
+{
+}
+
 void BoolSet::Set(int number)
 {
        this->bits |= bitfields[number];
@@ -122,14 +130,32 @@ bool Extensible::Register(ExtensionItem* item)
        return Extensible::extension_types.insert(std::make_pair(item->key, item)).second;
 }
 
-void Extensible::UnRegister(Module* module)
+std::vector<ExtensionItem*> Extensible::BeginUnregister(Module* module)
 {
+       std::vector<ExtensionItem*> rv;
        ExtensibleTypes::iterator i = extension_types.begin();
        while (i != extension_types.end())
        {
                ExtensibleTypes::iterator c = i++;
                if (c->second->owner == module)
+               {
+                       rv.push_back(c->second);
                        extension_types.erase(c);
+               }
+       }
+       return rv;
+}
+
+void Extensible::doUnhookExtensions(const std::vector<ExtensionItem*>& toRemove)
+{
+       for(std::vector<ExtensionItem*>::const_iterator i = toRemove.begin(); i != toRemove.end(); i++)
+       {
+               ExtensibleStore::iterator e = extensions.find((**i).key);
+               if (e != extensions.end())
+               {
+                       (**i).free(e->second);
+                       extensions.erase(e);
+               }
        }
 }
 
@@ -137,9 +163,11 @@ Extensible::~Extensible()
 {
        for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
        {
-               ExtensionItem* type = extension_types[i->first];
+               ExtensionItem* type = GetItem(i->first);
                if (type)
                        type->free(i->second);  
+               else if (ServerInstance && ServerInstance->Logs)
+                       ServerInstance->Logs->Log("BASE", ERROR, "Extension type %s is not registered", i->first.c_str());
        }
 }