(commons-crypto) branch native_simplify updated: Define HMODULE for Unix to simply conditional code

[se...@apache.org]

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

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


The following commit(s) were added to refs/heads/native_simplify by this push:
     new b9cc17c6 Define HMODULE for Unix to simply conditional code
b9cc17c6 is described below

commit b9cc17c6ca8d640738cd50642bc2cd4064e2e16c
Author: Sebb <se...@apache.org>
AuthorDate: Sat Nov 4 13:39:12 2023 +0000

    Define HMODULE for Unix to simply conditional code
---
 src/main/native/org/apache/commons/crypto/DynamicLoader.c          | 7 -------
 src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c      | 6 ------
 src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c   | 6 ------
 .../native/org/apache/commons/crypto/org_apache_commons_crypto.h   | 4 +++-
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/main/native/org/apache/commons/crypto/DynamicLoader.c b/src/main/native/org/apache/commons/crypto/DynamicLoader.c
index f64bb658..b6a4fe03 100644
--- a/src/main/native/org/apache/commons/crypto/DynamicLoader.c
+++ b/src/main/native/org/apache/commons/crypto/DynamicLoader.c
@@ -22,15 +22,8 @@ Shared code to load and unload the library.
 
 #include "org_apache_commons_crypto.h"
 
-#ifdef UNIX
-static void *openssl; // the cached pointer
-void *open_library(JNIEnv *env)
-#endif
-
-#ifdef WINDOWS
 static HMODULE openssl; // the cached pointer
 HMODULE open_library(JNIEnv *env)
-#endif
 
 {
   if (!openssl) {
diff --git a/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c b/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
index 62f41d26..23dae998 100644
--- a/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
+++ b/src/main/native/org/apache/commons/crypto/OpenSslInfoNative.c
@@ -80,13 +80,7 @@ static void get_methods(JNIEnv *env, HMODULE openssl)
 static int load_library(JNIEnv *env)
 {
   char msg[1000];
-#ifdef UNIX
-  void *openssl = open_library(env);
-#endif
-
-#ifdef WINDOWS
   HMODULE openssl = open_library(env);
-#endif
 
   if (!openssl) {
 #ifdef UNIX
diff --git a/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c b/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
index 814cb2a1..966e0fcb 100644
--- a/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
+++ b/src/main/native/org/apache/commons/crypto/cipher/OpenSslNative.c
@@ -133,13 +133,7 @@ JNIEXPORT void JNICALL Java_org_apache_commons_crypto_cipher_OpenSslNative_initI
     (JNIEnv *env, jclass clazz)
 {
   char msg[1000];
-#ifdef UNIX
-  void *openssl = open_library(env);
-#endif
-
-#ifdef WINDOWS
   HMODULE openssl = open_library(env);
-#endif
 
   if (!openssl) {
 #ifdef UNIX
diff --git a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
index 5c26aa0e..0c8f5ea6 100644
--- a/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
+++ b/src/main/native/org/apache/commons/crypto/org_apache_commons_crypto.h
@@ -77,7 +77,9 @@ void close_library();
 #include <dlfcn.h>
 #include <jni.h>
 
-void *open_library(JNIEnv *env);
+typedef void * HMODULE; // to agree with Windows type name
+
+HMODULE open_library(JNIEnv *env);
 
 /**
  * A helper function to dlsym a 'symbol' from a given library-handle.