mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-13 18:19:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Change the strerror_override handling to check $_JSON_C_STRERROR_OVERRIDE instead of using a variable, so we don't need to export it.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2020-07-04 18:56:15 +00:00
parent b01d50b8dc
commit 6068d3f6d1
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
strerror_override.c
View File

@@ -59,7 +59,8 @@ static struct
/* clang-format on */ /* clang-format on */
// Enabled during tests // Enabled during tests
int _json_c_strerror_enable = 0; static int _json_c_strerror_enable = 0;
extern char *getenv(const char *name); // Avoid including stdlib.h
#define PREFIX "ERRNO=" #define PREFIX "ERRNO="
static char errno_buf[128] = PREFIX; static char errno_buf[128] = PREFIX;
@@ -70,6 +71,8 @@ char *_json_c_strerror(int errno_in)
int ii, jj; int ii, jj;
if (!_json_c_strerror_enable) if (!_json_c_strerror_enable)
_json_c_strerror_enable = (getenv("_JSON_C_STRERROR_ENABLE") == NULL) ? -1 : 1;
if (_json_c_strerror_enable == -1)
return strerror(errno_in); return strerror(errno_in);
// Avoid standard functions, so we don't need to include any // Avoid standard functions, so we don't need to include any

4
tests/CMakeLists.txt
View File

@@ -37,6 +37,10 @@ foreach(TESTNAME
test_object_iterator) test_object_iterator)
add_executable(${TESTNAME} ${TESTNAME}.c) add_executable(${TESTNAME} ${TESTNAME}.c)
if(${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) add_test(NAME ${TESTNAME} COMMAND ${PROJECT_SOURCE_DIR}/tests/${TESTNAME}.test)
# XXX using the non-target_ versions of these doesn't work :( # XXX using the non-target_ versions of these doesn't work :(

2
tests/test_basic.test
View File

@@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
export _JSON_C_STRERROR_ENABLE=1
# Common definitions # Common definitions
if test -z "$srcdir"; then if test -z "$srcdir"; then
srcdir="${0%/*}" srcdir="${0%/*}"

5
tests/test_json_pointer.c
View File

@@ -1,9 +1,8 @@
#include "strerror_override.h"
#include "strerror_override_private.h"
#ifdef NDEBUG #ifdef NDEBUG
#undef NDEBUG #undef NDEBUG
#endif #endif
#include <assert.h> #include <assert.h>
#include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -320,8 +319,6 @@ static void test_wrong_inputs_set(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
_json_c_strerror_enable = 1;
test_example_get(); test_example_get();
test_recursion_get(); test_recursion_get();
test_wrong_inputs_get(); test_wrong_inputs_get();

2
tests/test_util_file.c
View File

@@ -127,8 +127,6 @@ int main(int argc, char **argv)
// json_object_to_file(file, obj); // json_object_to_file(file, obj);
// json_object_to_file_ext(file, obj, flags); // json_object_to_file_ext(file, obj, flags);
_json_c_strerror_enable = 1;
const char *testdir; const char *testdir;
if (argc < 2) if (argc < 2)
{ {