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

Merge pull request #663 from stoeckmann/strerror

Browse Source 
Properly format errnos in _json_c_strerror
This commit is contained in:
Eric Hawicz
2020-08-23 16:38:21 -04:00
committed by GitHub
parent 1bc7a6b223 4298431150
commit f941931804
5 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
strerror_override.c
View File

@@ -94,7 +94,7 @@ char *_json_c_strerror(int errno_in)
}
// It's not one of the known errno values, return the numeric value.
for (ii = 0; errno_in > 10; errno_in /= 10, ii++)
for (ii = 0; errno_in >= 10; errno_in /= 10, ii++)
{
digbuf[ii] = "0123456789"[(errno_in % 10)];
}
@@ -105,5 +105,6 @@ char *_json_c_strerror(int errno_in)
{
errno_buf[start_idx] = digbuf[ii];
}
errno_buf[start_idx] = '\0';
return errno_buf;
}

3
tests/CMakeLists.txt
View File

@@ -32,12 +32,13 @@ foreach(TESTNAME
test_printbuf
test_set_serializer
test_set_value
test_strerror
test_util_file
test_visit
test_object_iterator)
add_executable(${TESTNAME} ${TESTNAME}.c)
if(${TESTNAME} STREQUAL test_util_file)
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()

11
tests/test_strerror.c Normal file
View File

@@ -0,0 +1,11 @@
#include "strerror_override.h"
#include "strerror_override_private.h"
#include <stdio.h>
int main(int argc, char **argv)
{
puts(strerror(10000));
puts(strerror(999));
return 0;
}

2
tests/test_strerror.expected Normal file
View File

@@ -0,0 +1,2 @@
ERRNO=10000
ERRNO=999

1
tests/test_strerror.test Symbolic link
View File

@@ -0,0 +1 @@
test_basic.test