m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

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

diff --git a/src/server.cpp b/src/server.cpp
index 580ee5310c0616fd9548c872d5387e3aa6d74925..97b4058c0e321d00e2bb021d39a01c85d64ceacc 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -58,7 +58,7 @@ void InspIRCd::Exit(int status)
 void RehashHandler::Call(const std::string &reason)
 {
        ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str());
-       FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
+       FOREACH_MOD(OnGarbageCollect, ());
        if (!ServerInstance->ConfigThread)
        {
                ServerInstance->ConfigThread = new ConfigReaderThread("");
@@ -186,11 +186,11 @@ void ISupportManager::Build()
        tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
        tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
 
-       tokens["FNC"] = tokens["MAP"] = tokens["VBANLIST"] =
+       tokens["FNC"] = tokens["VBANLIST"] =
                tokens["WALLCHOPS"] = tokens["WALLVOICES"];
 
        // Modules can add new tokens and also edit or remove existing tokens
-       FOREACH_MOD(I_On005Numeric, On005Numeric(tokens));
+       FOREACH_MOD(On005Numeric, (tokens));
 
        // EXTBAN is a special case as we need to sort it and prepend a comma.
        std::map<std::string, std::string>::iterator extban = tokens.find("EXTBAN");