X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=511651941d609df21c3cddb8748eb8b03279a71c;hb=090e7b616104723960ab51d8faa966af333eb15d;hp=179113cae94dda3701f26f69822cf6b67ac035ac;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 179113cae..511651941 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,14 +11,15 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" -#include "configreader.h" #include "dynamic.h" #ifndef WIN32 #include #endif -DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname) +DLLManager::DLLManager(InspIRCd*, const char *fname) { err = NULL; @@ -38,7 +39,7 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname) DLLManager::~DLLManager() { - // close the library if it isn't null + /* close the library */ if (h) dlclose(h); } @@ -47,9 +48,11 @@ DLLManager::~DLLManager() 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) { dlerror(); // clear value @@ -58,32 +61,7 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name) if (!*v || err) return false; } - - if (err) - { - return false; - } - else - { - return true; - } -} -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()) - { - if (!GetSymbol( (void **)&factory_func, symbol ? symbol : "init_module")) - { - throw ModuleException("Missing init_module() entrypoint!"); - } - } -} - -DLLFactoryBase::~DLLFactoryBase() -{ + /* succeeded :) */ + return true; } -