Annotations

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 23e1e32671e2537ce2d795a4a2620ccb6b455eb5..ab6f5561035afdff443b9114e60e35cb2af9bde4 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -16,9 +16,7 @@
 
 using namespace std;
 
-#include "inspircd_config.h"
 #include "configreader.h"
-#include "globals.h"
 #include "dynamic.h"
 
 #ifndef STATIC_LINK
@@ -27,12 +25,7 @@ using namespace std;
 #include "modlist.h"
 #endif
 
-#include "inspstring.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdio.h>
 
 DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
@@ -45,13 +38,13 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
        }
 #ifdef STATIC_LINK
        this->staticname[0] = '\0';
-       log(DEBUG,"Loading core-compiled module '%s'",fname);
+       ServerInstance->Log(DEBUG,"Loading core-compiled module '%s'",fname);
        for (int j = 0; modsyms[j].name; j++)
        {
-               log(DEBUG,"Check %s",modsyms[j].name);
+               ServerInstance->Log(DEBUG,"Check %s",modsyms[j].name);
                if (!strcmp(modsyms[j].name,fname))
                {
-                       log(DEBUG,"Found %s",fname);
+                       ServerInstance->Log(DEBUG,"Found %s",fname);
                        strlcpy(this->staticname,fname,1020);
                        err = 0;
                        return;
@@ -69,7 +62,7 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
                err = strerror(errno);
                return;
        }
-       log(DEBUG,"Opened module file %s",fname);
+       ServerInstance->Log(DEBUG,"Opened module file %s",fname);
        char tmpfile_template[255];
        char buffer[65536];
        snprintf(tmpfile_template, 255, "%s/inspircd_file.so.%d.XXXXXXXXXX",ServerInstance->Config->TempDir,getpid());
@@ -80,7 +73,7 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
                err = strerror(errno);
                return;
        }
-       log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
+       ServerInstance->Log(DEBUG,"Copying %s to %s",fname, tmpfile_template);
        while (!feof(x))
        {
                int n = fread(buffer, 1, 65535, x);
@@ -95,7 +88,7 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
                        }
                }
        }
-       log(DEBUG,"Copied entire file.");
+       ServerInstance->Log(DEBUG,"Copied entire file.");
        // Try to open the library now and get any error message.
 
        if (close(fd) == -1)
@@ -106,17 +99,17 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
-               log(DEBUG,"dlerror occured!");
+               ServerInstance->Log(DEBUG,"dlerror occured!");
                err = (char*)dlerror();
                return;
        }
 
-       log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
+       ServerInstance->Log(DEBUG,"Finished loading '%s': %0x",tmpfile_template, h);
 
        // We can delete the tempfile once it's loaded, leaving just the inode.
        if (!err && !ServerInstance->Config->debugging)
        {
-               log(DEBUG,"Deleteting %s",tmpfile_template);
+               ServerInstance->Log(DEBUG,"Deleteting %s",tmpfile_template);
                if (unlink(tmpfile_template) == -1)
                        err = strerror(errno);
        }
@@ -138,12 +131,10 @@ DLLManager::~DLLManager()
 
 bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
 {
-       log(DEBUG,"Symbol search...");
        for (int j = 0; modsyms[j].name; j++)
        {
                if (!strcmp(this->staticname,modsyms[j].name))
                {
-                       log(DEBUG,"Loading symbol...");
                        v = modsyms[j].value;
                        err = 0;
                        return true;
@@ -162,7 +153,6 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name)
        
        if (h)
        {
-               log(DEBUG,"Found symbol %s", sym_name);
                dlerror(); // clear value
                *v = dlsym(h, sym_name);
                err = (char*)dlerror();