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 adff8630d523e2b4b285db5f40be5c70a82955b6..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,10 +37,9 @@ 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", LOG_DEFAULT, LastModuleError);
@@ -56,7 +54,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
        }
 
        Module* newmod = NULL;
-       DLLManager* newhandle = new DLLManager(modfile);
+       DLLManager* newhandle = new DLLManager(moduleFile.c_str());
 
        try
        {
@@ -66,11 +64,12 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                {
                        newmod->ModuleSourceFile = filename;
                        newmod->ModuleDLLManager = newhandle;
+                       newmod->dying = false;
                        Modules[filename] = newmod;
                        std::string version = newhandle->GetVersion();
                        if (defer)
                        {
-                               ServerInstance->Logs->Log("MODULE", LOG_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
@@ -78,7 +77,7 @@ bool ModuleManager::Load(const std::string& filename, bool defer)
                                newmod->init();
 
                                Version v = newmod->GetVersion();
-                               ServerInstance->Logs->Log("MODULE", LOG_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]"));
                        }
                }
@@ -109,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