Make connect class debug logging more complete and consistent.

[user/henk/code/inspircd.git] / src / dynamic.cpp

diff --git a/src/dynamic.cpp b/src/dynamic.cpp
index a3ba43ff24a8045c454ae88fefe16d18ec8d26b1..3df91e41f4037eb2f3fc1d550e3f4a229c2786a9 100644 (file)
--- a/src/dynamic.cpp
+++ b/src/dynamic.cpp
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2020 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2012 ChrisTX <xpipe@hotmail.de>
@@ -60,7 +61,7 @@ DLLManager::~DLLManager()
                return;
 
 #ifdef _WIN32
-       FreeLibrary(lib)
+       FreeLibrary(lib);
 #else
        dlclose(lib);
 #endif
@@ -68,7 +69,10 @@ DLLManager::~DLLManager()
 
 Module* DLLManager::CallInit()
 {
-       const uint32_t* abi = GetSymbol<const uint32_t>(MODULE_STR_ABI);
+       if (!lib)
+               return NULL;
+
+       const unsigned long* abi = GetSymbol<const unsigned long>(MODULE_STR_ABI);
        if (!abi)
        {
                err.assign(libname + " is not a module (no ABI symbol)");
@@ -77,9 +81,9 @@ Module* DLLManager::CallInit()
        else if (*abi != MODULE_ABI)
        {
                const char* version = GetVersion();
-               err.assign(InspIRCd::Format("%s was built against %s which is too %s to use with %s",
-                       libname.c_str(), version ? version : "an unknown version",
-                       *abi < MODULE_ABI ? "old" : "new", INSPIRCD_VERSION));
+               err.assign(InspIRCd::Format("%s was built against %s (%lu) which is too %s to use with %s (%lu).",
+                       libname.c_str(), version ? version : "an unknown version", *abi,
+                       *abi < MODULE_ABI ? "old" : "new", INSPIRCD_VERSION, MODULE_ABI));
                return NULL;
        }