Destroy Memberships of a quitting user in QuitUser() instead of in cull()

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

diff --git a/src/base.cpp b/src/base.cpp
index 66a3cb140076e0db326435458b98b8b7fecf8f06..cf28f8e7d34375359f1306d37ebde1c79af7415f 100644 (file)
--- a/src/base.cpp
+++ b/src/base.cpp
@@ -28,13 +28,13 @@
 classbase::classbase()
 {
        if (ServerInstance && ServerInstance->Logs)
-               ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::+ @%p", (void*)this);
+               ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::+ @%p", (void*)this);
 }
 
 CullResult classbase::cull()
 {
        if (ServerInstance && ServerInstance->Logs)
-               ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::-%s @%p",
+               ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::-%s @%p",
                        typeid(*this).name(), (void*)this);
        return CullResult();
 }
@@ -42,7 +42,7 @@ CullResult classbase::cull()
 classbase::~classbase()
 {
        if (ServerInstance && ServerInstance->Logs)
-               ServerInstance->Logs->Log("CULLLIST", DEBUG, "classbase::~ @%p", (void*)this);
+               ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "classbase::~ @%p", (void*)this);
 }
 
 CullResult::CullResult()
@@ -74,14 +74,14 @@ refcountbase::refcountbase() : refcount(0)
 refcountbase::~refcountbase()
 {
        if (refcount && ServerInstance && ServerInstance->Logs)
-               ServerInstance->Logs->Log("CULLLIST", DEBUG, "refcountbase::~ @%p with refcount %d",
+               ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "refcountbase::~ @%p with refcount %d",
                        (void*)this, refcount);
 }
 
 usecountbase::~usecountbase()
 {
        if (usecount && ServerInstance && ServerInstance->Logs)
-               ServerInstance->Logs->Log("CULLLIST", DEBUG, "usecountbase::~ @%p with refcount %d",
+               ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "usecountbase::~ @%p with refcount %d",
                        (void*)this, usecount);
 }
 
@@ -186,20 +186,24 @@ Extensible::Extensible()
 }
 
 CullResult Extensible::cull()
+{
+       FreeAllExtItems();
+       return classbase::cull();
+}
+
+void Extensible::FreeAllExtItems()
 {
        for(ExtensibleStore::iterator i = extensions.begin(); i != extensions.end(); ++i)
        {
                i->first->free(i->second);
        }
        extensions.clear();
-       return classbase::cull();
 }
 
 Extensible::~Extensible()
 {
        if (!extensions.empty() && ServerInstance && ServerInstance->Logs)
-               ServerInstance->Logs->Log("CULLLIST", DEBUG,
-                       "Extensible destructor called without cull @%p", (void*)this);
+               ServerInstance->Logs->Log("CULLLIST", LOG_DEBUG, "Extensible destructor called without cull @%p", (void*)this);
 }
 
 LocalExtItem::LocalExtItem(const std::string& Key, Module* mod) : ExtensionItem(Key, mod)
@@ -312,4 +316,3 @@ ModuleException::ModuleException(const std::string &message, Module* who)
        : CoreException(message, who ? who->ModuleSourceFile : "A Module")
 {
 }
-