X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=f2acdd51c6c11736ca62f42bf8bc53a85b4b64b6;hb=0ff2d05ba6b94c5346e6e3e528118fadae1cb126;hp=25178cfa111c7f287461e9fd4053e7f70e22cb0a;hpb=9375c633371ee8d25adc5cf756590077e5100bb5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 25178cfa1..f2acdd51c 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -22,7 +22,7 @@
 
 
 #include "inspircd.h"
-#include "dynamic.h"
+
 #ifndef _WIN32
 #include <dlfcn.h>
 #else
@@ -54,36 +54,30 @@ DLLManager::~DLLManager()
 		dlclose(h);
 }
 
-union init_t {
-	void* vptr;
-	Module* (*fptr)();
-};
-
 Module* DLLManager::CallInit()
 {
-	if (!h)
-		return NULL;
-
-	init_t initfn;
-	initfn.vptr = dlsym(h, MODULE_INIT_STR);
-	if (!initfn.vptr)
+	union
 	{
-		RetrieveLastError();
+		void* vptr;
+		Module* (*fptr)();
+	};
+
+	vptr = GetSymbol(MODULE_INIT_STR);
+	if (!vptr)
 		return NULL;
-	}
 
-	return (*initfn.fptr)();
+	return (*fptr)();
 }
 
-std::string DLLManager::GetVersion()
+void* DLLManager::GetSymbol(const char* name)
 {
-	if (!h)
-		return "";
+	return h ? dlsym(h, name) : NULL;
+}
 
-	const char* srcver = (char*)dlsym(h, "inspircd_src_version");
-	if (srcver)
-		return srcver;
-	return "Unversioned module";
+std::string DLLManager::GetVersion()
+{
+	const char* srcver = static_cast<const char*>(GetSymbol("inspircd_src_version"));
+	return srcver ? srcver : "";
 }
 
 void DLLManager::RetrieveLastError()
@@ -96,7 +90,7 @@ void DLLManager::RetrieveLastError()
 	SetLastError(ERROR_SUCCESS);
 	err = errmsg;
 #else
-	char* errmsg = dlerror();
+	const char* errmsg = dlerror();
 	err = errmsg ? errmsg : "Unknown error";
 #endif