X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fdynamic.cpp;h=f2acdd51c6c11736ca62f42bf8bc53a85b4b64b6;hb=4cc992f6c20354eef88b7652f268591daccb1b20;hp=9984f4dbeabe5c8873bdb91b2ecc6bb1382c1f1b;hpb=3a3ff949670c61a4a8856e1391222e156eb1cd17;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index 9984f4dbe..f2acdd51c 100644
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -43,11 +43,7 @@ DLLManager::DLLManager(const char *fname)
 	h = dlopen(fname, RTLD_NOW|RTLD_LOCAL);
 	if (!h)
 	{
-#ifdef _WIN32
 		RetrieveLastError();
-#else
-		err = dlerror();
-#endif
 	}
 }
 
@@ -58,54 +54,47 @@ 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
 	{
-#ifdef _WIN32
-		RetrieveLastError();
-#else
-		err = dlerror();
-#endif
+		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 : "";
 }
 
-#ifdef _WIN32
 void DLLManager::RetrieveLastError()
 {
+#if defined _WIN32
 	char errmsg[500];
 	DWORD dwErrorCode = GetLastError();
 	if (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)errmsg, _countof(errmsg), NULL) == 0)
 		sprintf_s(errmsg, _countof(errmsg), "Error code: %u", dwErrorCode);
 	SetLastError(ERROR_SUCCESS);
 	err = errmsg;
+#else
+	const char* errmsg = dlerror();
+	err = errmsg ? errmsg : "Unknown error";
+#endif
 
 	std::string::size_type p;
 	while ((p = err.find_last_of("\r\n")) != std::string::npos)
 		err.erase(p, 1);
 }
-#endif