Change the syntax of FOREACH macros to be less dumb.

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

diff --git a/src/modmanager_dynamic.cpp b/src/modmanager_dynamic.cpp
index 7dae49a18dc729009a1118e503dd0d3cff603589..a4a3ddb0bb7a16a8be0a9b3a5bc0bd3b0da9cf9d 100644 (file)
--- a/src/modmanager_dynamic.cpp
+++ b/src/modmanager_dynamic.cpp
@@ -22,7 +22,6 @@
 #include "socket.h"
 #include "socketengine.h"
 #include "command_parse.h"
-#include "dns.h"
 #include "exitcodes.h"
 #include <iostream>
 
@@ -38,25 +37,24 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
        if (filename.find('/') != std::string::npos)
                return false;
 
-       char modfile[MAXBUF];
-       snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename.c_str());
+       const std::string moduleFile = ServerInstance->Config->ModPath + "/" + filename;
 
-       if (!ServerConfig::FileExists(modfile))
+       if (!ServerConfig::FileExists(moduleFile.c_str()))
        {
                LastModuleError = "Module file could not be found: " + filename;
-               ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+               ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
                return false;
        }
 
        if (Modules.find(filename) != Modules.end())
        {
                LastModuleError = "Module " + filename + " is already loaded, cannot load a module twice!";
-               ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+               ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
                return false;
        }
 
        Module* newmod = NULL;
-       DLLManager* newhandle = new DLLManager(modfile);
+       DLLManager* newhandle = new DLLManager(moduleFile.c_str());
 
        try
        {
@@ -71,7 +69,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                        std::string version = newhandle->GetVersion();
                        if (defer)
                        {
-                               ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)",
+                               ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)",
                                        filename.c_str(), version.c_str());
                        }
                        else
@@ -79,14 +77,14 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                                newmod->init();
 
                                Version v = newmod->GetVersion();
-                               ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (Module version %s)%s",
+                               ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "New module introduced: %s (Module version %s)%s",
                                        filename.c_str(), version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
                        }
                }
                else
                {
                        LastModuleError = "Unable to load " + filename + ": " + newhandle->LastError();
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+                       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
                        delete newhandle;
                        return false;
                }
@@ -102,7 +100,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                else
                        delete newhandle;
                LastModuleError = "Unable to load " + filename + ": " + modexcept.GetReason();
-               ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+               ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
                return false;
        }
 
@@ -110,7 +108,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
        if (defer)
                return true;
 
-       FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod));
+       FOREACH_MOD(OnLoadModule, (newmod));
        /* We give every module a chance to re-prioritize when we introduce a new one,
         * not just the one thats loading, as the new module could affect the preference
         * of others
@@ -124,10 +122,10 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                if (prioritizationState == PRIO_STATE_LAST)
                        break;
                if (tries == 19)
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename);
+                       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected while loading " + filename);
        }
 
-       ServerInstance->BuildISupport();
+       ServerInstance->ISupport.Build();
        return true;
 }
 
@@ -204,7 +202,7 @@ void ModuleManager::LoadAll()
 
                                if (!Load(entry->d_name, true))
                                {
-                                       ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
+                                       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());
                                        std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
                                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                                }
@@ -223,7 +221,7 @@ void ModuleManager::LoadAll()
 
                if (!this->Load(name, true))
                {
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, this->LastError());
+                       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, this->LastError());
                        std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << this->LastError() << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
@@ -234,13 +232,13 @@ void ModuleManager::LoadAll()
                Module* mod = i->second;
                try
                {
-                       ServerInstance->Logs->Log("MODULE", DEBUG, "Initializing %s", i->first.c_str());
+                       ServerInstance->Logs->Log("MODULE", LOG_DEBUG, "Initializing %s", i->first.c_str());
                        mod->init();
                }
                catch (CoreException& modexcept)
                {
                        LastModuleError = "Unable to initialize " + mod->ModuleSourceFile + ": " + modexcept.GetReason();
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError);
+                       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, LastModuleError);
                        std::cout << std::endl << "[" << con_red << "*" << con_reset << "] " << LastModuleError << std::endl << std::endl;
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
@@ -260,7 +258,7 @@ void ModuleManager::LoadAll()
                        break;
                if (tries == 19)
                {
-                       ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected");
+                       ServerInstance->Logs->Log("MODULE", LOG_DEFAULT, "Hook priority dependency loop detected");
                        ServerInstance->Exit(EXIT_STATUS_MODULE);
                }
        }