You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2023/11/06 11:04:31 UTC

(commons-crypto) branch crypto-174 updated: Add some error messages

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch crypto-174
in repository https://gitbox.apache.org/repos/asf/commons-crypto.git


The following commit(s) were added to refs/heads/crypto-174 by this push:
     new 158da132 Add some error messages
158da132 is described below

commit 158da13290bd03404c70cd0caa28efe76fde4425
Author: Sebb <se...@apache.org>
AuthorDate: Mon Nov 6 11:04:25 2023 +0000

    Add some error messages
---
 .../native/org/apache/commons/crypto/DynamicLoader.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/native/org/apache/commons/crypto/DynamicLoader.c b/src/main/native/org/apache/commons/crypto/DynamicLoader.c
index d639cbbc..ba17aff8 100644
--- a/src/main/native/org/apache/commons/crypto/DynamicLoader.c
+++ b/src/main/native/org/apache/commons/crypto/DynamicLoader.c
@@ -57,9 +57,23 @@ HMODULE open_library(JNIEnv *env)
     dlerror()); // returns char*
 #endif
 #ifdef WINDOWS
-    // TODO: convert to string
-    snprintf(msg, sizeof(msg), "Cannot load %s (%d)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
-    GetLastError()); // returns DWORD
+    // Crude method to convert most likely errors to string
+    DWORD lastError = GetLastError();
+    char *lastmsg;
+    if (lasterror == 126)
+    {
+        lastmsg = "specified module cannot be found";
+    }
+    else if (lasterror == 193)
+    {
+        lastmsg = "module is not a valid Win32 application";
+    }
+    else
+    {
+        lastmsg = "unknown error - check online Windows documentation";
+    }
+    snprintf(msg, sizeof(msg), "Cannot load %s (%d: %s)!", COMMONS_CRYPTO_OPENSSL_LIBRARY,  \
+    lasterror, lastmsg);
 #endif
     THROW(env, "java/lang/UnsatisfiedLinkError", msg);
     return 0;