Remove some of this, this isn't (strictly speaking) an issue now

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

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 9d8bb3bae75f91db47fd32651dc7229ff6686390..ddbf6acae8e7d12980c3efeb8a5f69e2418d92d2 100644 (file)
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -117,20 +117,13 @@ int CullList::Apply()
                        u->AddToWhoWas();
                }
 
-               bool deleteu = true;
-
                if (iter != ServerInstance->Users->clientlist->end())
                {
                        ServerInstance->Users->clientlist->erase(iter);
                }
                else
                {
-                       /*
-                        * Trying to track down Jason's issue.. this should never happen obviously.
-                        */
-                       ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic?");
-//                     deleteu = false;
-// actually, delete them anyway.. the local vector is the real problem here
+                       ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
                }
 
                if (IS_LOCAL(u))
@@ -140,22 +133,11 @@ int CullList::Apply()
                                ServerInstance->Users->local_users.erase(x);
                        else
                        {
-                               /*
-                                * This code is in here to monitor an issue of Jason's, where it seems to be trying to quit already quit users.
-                                * The only way that can happen is if this find fails, so log it just in case.
-                                * Also, (perhaps incorrectly, but oh well), return here so we don't delete the user and then start trampling
-                                * on deleted memory, which leads to big problems..
-                                */
-                               ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector, we're all gonna die!!! Not deleting the user to save our sanity");
-                               deleteu = false;
+                               ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
                        }
                }
 
-               if (deleteu)
-               {
-                       delete u;
-               }
-
+               delete u;
                list.erase(list.begin());
        }