X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=704c4d9ddc7736f20f48c92a1d7937e789f536ba;hb=1b3dabf0ba0088bf7a8493fe89e478731ad0d307;hp=80035ef70575f95faa491fb32c97db66f82d8f80;hpb=4bbca0643b56f26f73a05462d226b2dd8871626b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 80035ef70..704c4d9dd 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,13 +11,15 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" #include "dynamic.h" #ifndef WIN32 #include #endif -DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname) +DLLManager::DLLManager(InspIRCd*, const char *fname) { err = NULL; @@ -30,7 +32,7 @@ DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname) h = dlopen(fname, RTLD_NOW|RTLD_LOCAL); if (!h) { - err = (char*)dlerror(); + err = dlerror(); return; } } @@ -50,35 +52,16 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name) * try extract a symbol from the library * get any error message is there is any */ - + if (h) { dlerror(); // clear value *v = dlsym(h, sym_name); - err = (char*)dlerror(); + err = dlerror(); if (!*v || err) return false; } - + /* succeeded :) */ 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() -{ -} -