Fix total mess of makefile dependency macros (all depending on stuff they dont NEED...

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

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 2092d0f4ecbca73d780a4259ba893151bf4d33a9..b1c84e874eeaca703c06568530b29cdebd6930d9 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,18 +11,15 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
-#include "dynamic.h"
+/* $Core: libIRCDdynamic */
 
-#ifndef STATIC_LINK
+#include "inspircd.h"
+#include "dynamic.h"
+#ifndef WIN32
 #include <dlfcn.h>
-#else
-#include "modlist.h"
 #endif
 
-#include "inspircd.h"
-
-DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname)
+DLLManager::DLLManager(InspIRCd*, const char *fname)
 {
        err = NULL;
 
@@ -31,68 +28,30 @@ 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
+       /* close the library */
        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
-       // get any error message is there is any
+       /*
+        * try extract a symbol from the library
+        * get any error message is there is any
+        */
        
        if (h)
        {
@@ -103,37 +62,6 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name)
                        return false;
        }
        
-       if (err)
-       {
-               return false;
-       }
-       else
-       {       
-               return true;
-       }
+       /* succeeded :) */
+       return true;
 }
-
-#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
-       factory_func = 0;
-       
-       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!");
-               }
-       }
-}
-
-DLLFactoryBase::~DLLFactoryBase()
-{
-}
-