Convert more by-values to const references, optimise ConfigReader a bit

[user/henk/code/inspircd.git] / include / cull_list.h

diff --git a/include/cull_list.h b/include/cull_list.h
index 2422f05b64d63b94744dd2359acd1d5cbcb91473..ca7189f4ce9b0603026cc27098e6c57efa48fbb4 100644 (file)
--- a/include/cull_list.h
+++ b/include/cull_list.h
@@ -50,7 +50,8 @@ class CullItem
         * @param u The user to add
         * @param r The quit reason of the added user
         */
-        CullItem(userrec* u, std::string r);
+        CullItem(userrec* u, std::string &r);
+       CullItem(userrec* u, const char* r);
        /** Returns a pointer to the user
         */
         userrec* GetUser();
@@ -82,9 +83,17 @@ class CullList
          std::vector<CullItem> list;
         /** A list of users who have already been
          * placed on the list, as a map for fast
-         * reference.
+         * reference. When deleting an item, the
+         * time_t value stored here must match
+         * the one of the actual userrec, otherwise
+         * we don't delete it (its a different user)
          */
-        std::map<userrec*,int> exempt;
+        std::map<userrec*,time_t> exempt;
+        
+        /** Check if a user pointer is valid
+         * (e.g. it exists in the user hash)
+         */
+        bool IsValid(userrec* user);
  public:
         /** Constructor.
          * Clears the CullList::list and CullList::exempt
@@ -96,7 +105,8 @@ class CullList
          * @param user The user to add
          * @param reason The quit reason of the user being added
          */
-         void AddItem(userrec* user, std::string reason);
+         void AddItem(userrec* user, std::string &reason);
+        void AddItem(userrec* user, const char* reason);
         /** Applies the cull list, quitting all the users
          * on the list with their quit reasons all at once.
          * This is a very fast operation compared to