Merge pull request #1004 from SaberUK/insp20+fix-various-warnings

[2.0] Fix various warnings with the new Doxygen and LLVM releases.

diff --git a/docs/conf/helpop-full.conf.example b/docs/conf/helpop-full.conf.example
index f86eb23946b28b123eff2a33818c9d65046f4e7f..a3529b9dcfd51d6af3e4ac7d4a7c025ce879dde3 100644 (file)
--- a/docs/conf/helpop-full.conf.example
+++ b/docs/conf/helpop-full.conf.example
@@ -1058,8 +1058,6 @@ Acting extbans:
                matching users (requires blockcaps module).
  C:<banmask>   Blocks CTCPs from matching users (requires noctcp
                module).
- M:<account>   Blocks messages from users logged into a matching
-               account (requires services account module).
  N:<banmask>   Blocks nick changes from matching users (requires
                nonicks module).
  Q:<banmask>   Blocks kicks by matching users (requires nokicks
@@ -1072,8 +1070,8 @@ Acting extbans:
                (requires services account).
 
 A ban given to an Acting extban may either be a nick!user@host mask
-(unless stated otherwise, for example M: taking an account name),
-matched against users as for a normal ban, or a Matching extban.
+(unless stated otherwise), matched against users as for a normal ban,
+or a Matching extban.
 
 There is an additional special type of extended ban, a redirect ban:
 

diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf.example
index 5b92faedacaf94b3f4b14022feb1be411c95cf68..32884ea16c25ccd6c0b47f4a8ce27b195d3214ca 100644 (file)
--- a/docs/conf/helpop.conf.example
+++ b/docs/conf/helpop.conf.example
@@ -300,8 +300,6 @@ Acting extbans:
                matching users (requires blockcaps module).
  C:<banmask>   Blocks CTCPs from matching users (requires noctcp
                module).
- M:<account>   Blocks messages from users logged into a matching
-               account (requires services account module).
  N:<banmask>   Blocks nick changes from matching users (requires
                nonicks module).
  Q:<banmask>   Blocks kicks by matching users (requires nokicks
@@ -314,8 +312,8 @@ Acting extbans:
                (requires services account).
 
 A ban given to an Acting extban may either be a nick!user@host mask
-(unless stated otherwise, for example M: taking an account name),
-matched against users as for a normal ban, or a Matching extban.
+(unless stated otherwise), matched against users as for a normal ban,
+or a Matching extban.
 
 There is an additional special type of extended ban, a redirect ban:
 

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 70025260d823f7012d6625f3d49aa90865819be3..71a0fb079b8b58b33c07198987d355abc4f10628 100644 (file)
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -1613,9 +1613,8 @@
 # as identified separately from the idea of a master account, which
 # can be useful for services which are heavily nick-as-account centric.
 #
-# Also of note is that this module implements three extbans:
+# Also of note is that this module implements two extbans:
 # +b R: (stop matching account names from joining)
-# +b M: (stop matching account names from speaking)
 # +b U:n!u@h (blocks matching unregistered users)
 #
 #<module name="m_services_account.so">

diff --git a/include/usermanager.h b/include/usermanager.h
index ac8ae1cb3ef1b82eb12a64756dfd06da1e737559..2a9d6b47b2b9ca54c893ba75a07bbe296a74f9e9 100644 (file)
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -112,6 +112,10 @@ class CoreExport UserManager
         */
        void RemoveCloneCounts(User *user);
 
+       /** Rebuild clone counts
+        */
+       void RehashCloneCounts();
+
        /** Return the number of global clones of this user
         * @param user The user to get a count for
         * @return The global clone count of this user

diff --git a/make/template/main.mk b/make/template/main.mk
index f88a80e3a872569e2b79aef1ec9b97b4bdc22a07..d5705d92876f063424c35c991a829a0c6b342d9c 100644 (file)
--- a/make/template/main.mk
+++ b/make/template/main.mk
@@ -125,6 +125,7 @@ CXXFLAGS += -Iinclude
   @BSD_ONLY MAKE += -s
   RUNCC = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
   RUNLD = perl $(SOURCEPATH)/make/run-cc.pl $(CC)
+  VERBOSE =
 @ENDIF
 
 @IFDEF PURE_STATIC

diff --git a/src/configreader.cpp b/src/configreader.cpp
index b3caf8c7501146e7afdac5d80d0ed42c6f877234..bcee938d55208e1aefc3dcc5d0db93cf81820175 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -963,6 +963,7 @@ void ConfigReaderThread::Finish()
                 * XXX: The order of these is IMPORTANT, do not reorder them without testing
                 * thoroughly!!!
                 */
+               ServerInstance->Users->RehashCloneCounts();
                ServerInstance->XLines->CheckELines();
                ServerInstance->XLines->ApplyLines();
                ServerInstance->Res->Rehash();

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 1918b5c4c1cc43a985c13fc3880c376297f41045..76446c5b57fb07371adaa9b6730e6f335d7e0805 100644 (file)
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -287,6 +287,22 @@ void UserManager::RemoveCloneCounts(User *user)
        }
 }
 
+void UserManager::RehashCloneCounts()
+{
+       local_clones.clear();
+       global_clones.clear();
+
+       const user_hash& hash = *ServerInstance->Users->clientlist;
+       for (user_hash::const_iterator i = hash.begin(); i != hash.end(); ++i)
+       {
+               User* u = i->second;
+
+               if (IS_LOCAL(u))
+                       AddLocalClone(u);
+               AddGlobalClone(u);
+       }
+}
+
 unsigned long UserManager::GlobalCloneCount(User *user)
 {
        clonemap::iterator x = global_clones.find(user->GetCIDRMask());