Update documentation and remove unused classes/functions

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 862aa31d093f26276d92e7db82d6c691c8616980..d9f1d042366c8653802bf8a822aea03d71e02dc6 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -90,16 +90,13 @@ template<typename T> static void DeleteZero(T*&n)
 
 void InspIRCd::Cleanup()
 {
-       if (Config)
+       for (unsigned int i = 0; i < ports.size(); i++)
        {
-               for (unsigned int i = 0; i < ports.size(); i++)
-               {
-                       /* This calls the constructor and closes the listening socket */
-                       delete ports[i];
-               }
-
-               ports.clear();
+               /* This calls the constructor and closes the listening socket */
+               ports[i]->cull();
+               delete ports[i];
        }
+       ports.clear();
 
        /* Close all client sockets, or the new process inherits them */
        std::vector<User*>::reverse_iterator i = Users->local_users.rbegin();
@@ -114,6 +111,8 @@ void InspIRCd::Cleanup()
 
        /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
        /* Must be deleted before modes as it decrements modelines */
+       if (FakeClient)
+               FakeClient->cull();
        DeleteZero(this->FakeClient);
        DeleteZero(this->Users);
        DeleteZero(this->Modes);