From: Eric Haszlakiewicz <erh+git@nimenees.com>
Date: Tue, 28 Mar 2023 23:08:39 +0000 (+0000)
Subject: Stop linking a copy of _json_c_strerror() (strerror_override.c) into the tests.
X-Git-Tag: json-c-0.17-20230812~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0f32a5a43d1b9dc0b2cd6af310e5f09b97c3423;p=thirdparty%2Fjson-c.git

Stop linking a copy of _json_c_strerror() (strerror_override.c) into the tests.
That hasn't been needed since since commit 6068d3f, which changed that code to
 check an env var instead ("_JSON_C_STRERROR_ENABLE").
Fixes issue #812, about dup symbols in static builds with clang.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c917c17c..7455b1e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -398,7 +398,6 @@ set(JSON_C_HEADERS
     ${PROJECT_SOURCE_DIR}/json_object_private.h
     ${PROJECT_SOURCE_DIR}/random_seed.h
     ${PROJECT_SOURCE_DIR}/strerror_override.h
-    ${PROJECT_SOURCE_DIR}/strerror_override_private.h
     ${PROJECT_SOURCE_DIR}/math_compat.h
     ${PROJECT_SOURCE_DIR}/snprintf_compat.h
     ${PROJECT_SOURCE_DIR}/strdup_compat.h
diff --git a/json-c.sym b/json-c.sym
index 1942acd5..2867c803 100644
--- a/json-c.sym
+++ b/json-c.sym
@@ -41,6 +41,8 @@ JSONC_PRIVATE {
     printbuf_new;
     printbuf_reset;
     sprintbuf;
+    # Used by tests:
+    _json_c_strerror;
 };
 
 JSONC_0.14 {
diff --git a/strerror_override_private.h b/strerror_override_private.h
deleted file mode 100644
index 8726e59f..00000000
--- a/strerror_override_private.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __json_strerror_override_private_h__
-#define __json_strerror_override_private_h__
-
-/**
- * @file
- * @brief Do not use, json-c internal, may be changed or removed at any time.
- */
-
-#include "json_types.h"
-
-/* Used by tests to get consistent output */
-JSON_EXPORT int _json_c_strerror_enable;
-
-#endif
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index beef00ac..bdee375e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -44,10 +44,6 @@ endif()
 foreach(TESTNAME ${ALL_TEST_NAMES})
 
 add_executable(${TESTNAME} ${TESTNAME}.c)
-if(${TESTNAME} STREQUAL test_strerror OR ${TESTNAME} STREQUAL test_util_file)
-# For output consistency, we need _json_c_strerror() in some tests:
-target_sources(${TESTNAME} PRIVATE ../strerror_override.c)
-endif()
 add_test(NAME ${TESTNAME} COMMAND ${PROJECT_SOURCE_DIR}/tests/${TESTNAME}.test)
 
 # XXX using the non-target_ versions of these doesn't work :(
diff --git a/tests/test_strerror.c b/tests/test_strerror.c
index 57b051f1..773b1aa1 100644
--- a/tests/test_strerror.c
+++ b/tests/test_strerror.c
@@ -2,7 +2,6 @@
 #undef NDEBUG
 #endif
 #include "strerror_override.h"
-#include "strerror_override_private.h"
 
 #include <stdio.h>
 
diff --git a/tests/test_util_file.c b/tests/test_util_file.c
index 27a097e7..036dcbc6 100644
--- a/tests/test_util_file.c
+++ b/tests/test_util_file.c
@@ -2,7 +2,6 @@
 #undef NDEBUG
 #endif
 #include "strerror_override.h"
-#include "strerror_override_private.h"
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <io.h>