X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=2256b38fc9f0ff171a6ec5623b7f5e5f44796813;hb=4cc6e5e14fdbde499481dbab5ab2ad1257b8af9c;hp=0d719755a7b373748ce768ea6a5f3fc8a884aebe;hpb=e2de2008a29cc4660705498ba91eeac66a363393;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 0d719755a..2256b38fc 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -11,10 +11,11 @@ * --------------------------------------------------- */ -#include "configreader.h" +#include "inspircd.h" #include "dynamic.h" +#ifndef WIN32 #include -#include "inspircd.h" +#endif DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname) { @@ -36,7 +37,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); } @@ -45,8 +46,10 @@ 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) { @@ -57,31 +60,6 @@ bool DLLManager::GetSymbol(void** v, const char* sym_name) return false; } - if (err) - { - return false; - } - else - { - return true; - } + /* 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() -{ -} -