Conversions

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2092d0f4ecbca73d780a4259ba893151bf4d33a9..179113cae94dda3701f26f69822cf6b67ac035ac 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -11,17 +11,13 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "dynamic.h"
-
-#ifndef STATIC_LINK
+#ifndef WIN32
 #include <dlfcn.h>
-#else
-#include "modlist.h"
 #endif
 
-#include "inspircd.h"
-
 DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
 {
        err = NULL;
@@ -31,64 +27,24 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
                err = "This doesn't look like a module file to me...";
                return;
        }
-#ifdef STATIC_LINK
-       this->staticname[0] = '\0';
-       ServerInstance->Log(DEBUG,"Loading core-compiled module '%s'",fname);
-       for (int j = 0; modsyms[j].name; j++)
-       {
-               ServerInstance->Log(DEBUG,"Check %s",modsyms[j].name);
-               if (!strcmp(modsyms[j].name,fname))
-               {
-                       ServerInstance->Log(DEBUG,"Found %s",fname);
-                       strlcpy(this->staticname,fname,1020);
-                       err = 0;
-                       return;
-               }
-       }
-       err = "Module is not statically compiled into the ircd";
-#else
+
        h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
        if (!h)
        {
                err = (char*)dlerror();
-               ServerInstance->Log(DEBUG,"dlerror '%s' occured!", err);
                return;
        }
-
-       ServerInstance->Log(DEBUG,"Finished loading '%s': %0x", fname, h);
-#endif
 }
 
 DLLManager::~DLLManager()
 {
-#ifndef STATIC_LINK
        // close the library if it isn't null
        if (h)
                dlclose(h);
-#endif
 }
 
 
 
-#ifdef STATIC_LINK
-
-bool DLLManager::GetSymbol(initfunc* &v, const char *sym_name)
-{
-       for (int j = 0; modsyms[j].name; j++)
-       {
-               if (!strcmp(this->staticname,modsyms[j].name))
-               {
-                       v = modsyms[j].value;
-                       err = 0;
-                       return true;
-               }
-       }
-       err = "Module symbol missing from the core";
-       return false;
-}
-
-#else
-
 bool DLLManager::GetSymbol(void** v, const char* sym_name)
 {
        // try extract a symbol from the library
@@ -113,8 +69,6 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name)
        }
 }
 
-#endif
-
 DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char* symbol) : DLLManager(Instance, fname)
 {
        // try get the factory function if there is no error yet
@@ -122,11 +76,7 @@ DLLFactoryBase::DLLFactoryBase(InspIRCd* Instance, const char* fname, const char
        
        if (!LastError())
        {
-#ifdef STATIC_LINK
-               if (!GetSymbol( factory_func, symbol ? symbol : "init_module"))
-#else
                if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module"))
-#endif
                {
                        throw ModuleException("Missing init_module() entrypoint!");
                }