[acquire/tests/CMakeLists.txt] Ensure STRERRORLEN_IMPL is here on non Windows ; [acquire/acquire_*.h] Minor changes to be C89 compliant and resolve all such warnings on Linux

Author: SamuelMarks

acquire/acquire_librhash.h

@@ -21,6 +21,10 @@ struct rhash_backend {
   unsigned int algorithm_id;
 };
 
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#else
+__attribute__((unused))
+#endif
 static int rhash_lib_initialized = 0;
 
 extern LIBACQUIRE_EXPORT int

acquire/acquire_miniz.h

@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kubazip/zip/zip.h>
+#include <kubazip/zip.h>
 
 #include "acquire_extract.h"
 #include "acquire_fileutils.h"

acquire/acquire_openssl.h

@@ -138,14 +138,16 @@ int _openssl_verify_async_start(struct acquire_handle *handle,
     break;
   }
 #else
-  const EVP_MD *md =
-      (algorithm == LIBACQUIRE_SHA256) ? EVP_sha256() : EVP_sha512();
-  be->ctx = EVP_MD_CTX_new();
-  if (!be->ctx || (1 != EVP_DigestInit_ex(be->ctx, md, NULL))) {
-    cleanup_openssl_backend(handle);
-    acquire_handle_set_error(handle, ACQUIRE_ERROR_UNKNOWN,
-                             "EVP_DigestInit_ex failed");
-    return -1;
+  {
+    const EVP_MD *md =
+        (algorithm == LIBACQUIRE_SHA256) ? EVP_sha256() : EVP_sha512();
+    be->ctx = EVP_MD_CTX_new();
+    if (!be->ctx || (1 != EVP_DigestInit_ex(be->ctx, md, NULL))) {
+      cleanup_openssl_backend(handle);
+      acquire_handle_set_error(handle, ACQUIRE_ERROR_UNKNOWN,
+                               "EVP_DigestInit_ex failed");
+      return -1;
+    }
   }
 #endif
 

acquire/acquire_string_extras.h

@@ -86,7 +86,7 @@ typedef int errno_t;
 #define strerror_s strerror_r
 #endif /* !strerror_s */
 
-#define HAVE_STRERRORLEN_S 1
+/*#define HAVE_STRERRORLEN_S 1*/
 #endif /* defined(__linux__) || defined(linux) || defined(__linux) ||          \
           defined(ANY_BSD) */
 
@@ -130,7 +130,7 @@ extern LIBACQUIRE_EXPORT char *strcasestr(const char *, const char *);
 #endif /* !defined(HAVE_STRCASESTR) || defined(STRCASESTR_IMPL) &&             \
           STRCASESTR_IMPL */
 
-#if !defined(HAVE_STRERRORLEN_S) ||                                            \
+#if !defined(HAVE_STRERRORLEN_S) || HAVE_STRERRORLEN_S == 0 ||                 \
     defined(STRERRORLEN_IMPL) && STRERRORLEN_IMPL
 
 extern LIBACQUIRE_EXPORT size_t strerrorlen_s(errno_t);

acquire/tests/CMakeLists.txt

@@ -188,7 +188,7 @@ if (MSVC)
             PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;STRCASESTR_IMPL=1;STRNCASECMP_IMPL=0;STRNSTR_IMPL=1;STRERRORLEN_IMPL=1")
 else ()
     set_source_files_properties("test_string_extras.c"
-            PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1")
+            PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;STRERRORLEN_IMPL=1")
 endif ()
 #set_source_files_properties("test.c"
 #        PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_DOWNLOAD_DIR_IMPL=1")

acquire/tests/test_fileutils.h

@@ -22,10 +22,10 @@ typedef size_t num_type;
 #define BOOL_FORMAT NUM_FORMAT
 #elif defined(__linux__) || defined(linux) || defined(__linux)
 #ifndef NUM_FORMAT
-#define NUM_FORMAT "d"
+#define NUM_FORMAT "ld"
 typedef int num_type;
 #endif /* !NUM_FORMAT */
-#define BOOL_FORMAT "d"
+#define BOOL_FORMAT "ld"
 #else
 #ifndef NUM_FORMAT
 #define NUM_FORMAT "d"

acquire/tests/test_string_extras.h

@@ -71,7 +71,7 @@ TEST test_strerrorlen_s_impl(void) {
 #else
   {
     const char *err_str = strerror(EDOM);
-    ASSERT_EQ_FMT(strlen(err_str), len, "%zu");
+    ASSERT_EQ_FMT(strlen(err_str), len, "%ld");
   }
 #endif
   PASS();