[acquire/tests/test_*.h] Start removing the LIBACQUIRE_IMPLEMENTATION definitions, moving them to CMakeLists.txt in target_compile_definitions

Author: SamuelMarks

acquire/cli/cli.h

@@ -11,7 +11,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#elif defined(__STDC__) && defined(__STDC_VERSION__) &&                          \
+#elif defined(__STDC__) && defined(__STDC_VERSION__) &&                        \
     __STDC_VERSION__ >= 199901L
 
 #include <stdbool.h>
@@ -40,7 +40,6 @@ typedef size_t bool;
 #include <stddef.h>
 #include <string.h>
 
-
 /* ARG_MAX definition block kept as-is for compatibility */
 #if defined(_AIX)
 

acquire/cli/main.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define LIBACQUIRE_IMPLEMENTATION
+#include <errno.h>
 
 #include <acquire_common_defs.h>
 #include <acquire_config.h>
@@ -44,7 +44,7 @@
 
 int main(int argc, char *argv[]) {
   int rc = EXIT_SUCCESS;
-  struct DocoptArgs *args = malloc(sizeof *args);
+  struct DocoptArgs *args = calloc(1, sizeof *args);
   enum Checksum checksum = LIBACQUIRE_SHA256;
   char output_full_path[NAME_MAX + 1];
   const char *check_env = NULL;

acquire/tests/CMakeLists.txt

@@ -156,5 +156,7 @@ foreach (ARCHIVE_LIB ${_archives})
             "lib${PROJECT_NAME}"
             "${archive_lib}"
     )
+    target_compile_definitions("${EXEC_NAME}" PRIVATE LIBACQUIRE_IMPLEMENTATION=1)
+
     test_wrapper()
 endforeach (ARCHIVE_LIB ${_archives})

acquire/tests/test_amalgamation.h

@@ -4,8 +4,6 @@
 #include <greatest.h>
 #include <stdbool.h>
 
-#define LIBACQUIRE_IMPLEMENTATION
-
 #include <acquire.h>
 #include <acquire_config.h>
 #include <config_for_tests.h>

acquire/tests/test_checksum.h

@@ -9,8 +9,6 @@
 #include <acquire_config.h>
 #include <config_for_tests.h>
 
-#define LIBACQUIRE_IMPLEMENTATION
-
 #ifdef USE_CRC32C
 #include <acquire_crc32c.h>
 #elif defined(USE_LIBRHASH)

acquire/tests/test_download.h

@@ -3,8 +3,6 @@
 
 #include <greatest.h>
 
-#define LIBACQUIRE_IMPLEMENTATION
-
 #include <acquire_common_defs.h>
 #include <acquire_config.h>
 #include <config_for_tests.h>

acquire/tests/test_extract.h

@@ -13,10 +13,8 @@
 #define PATH_SEP "/"
 #endif /* defined(_MSC_VER) && !defined(__INTEL_COMPILER) */
 
-#define LIBACQUIRE_IMPLEMENTATION
 #include <acquire_fileutils.h>
 #include ARCHIVE_LIB_NAME
-#undef LIBACQUIRE_IMPLEMENTATION
 
 #include <acquire_common_defs.h>
 #include <acquire_config.h>

acquire/tests/test_fileutils.h

@@ -3,9 +3,7 @@
 
 #include <greatest.h>
 
-#define LIBACQUIRE_IMPLEMENTATION
 #include <acquire_fileutils.h>
-#undef LIBACQUIRE_IMPLEMENTATION
 
 #include <config_for_tests.h>