github-code/json-c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux's %p format doesn't return "0x0" for NULL pointers, so switch to using %lx for consistency.

Browse Source
This commit is contained in:
Eric Haszlakiewicz
2016-07-30 15:09:51 -04:00
parent deb9fa482d
commit 7d637362b7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_util_file.c
View File

@@ -5,6 +5,8 @@
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "json.h" #include "json.h"
#include "json_util.h" #include "json_util.h"
@@ -124,7 +126,7 @@ static void test_read_nonexistant()
json_object *jso = json_object_from_file(filename); json_object *jso = json_object_from_file(filename);
if (jso != NULL) if (jso != NULL)
{ {
printf("FAIL: json_object_from_file(%s) returned %p when NULL expected\n", filename, jso); printf("FAIL: json_object_from_file(%s) returned 0x%lx when NULL expected\n", filename, (unsigned long)jso);
json_object_put(jso); json_object_put(jso);
} }
else else
@@ -142,11 +144,11 @@ static void test_read_closed()
json_object *jso = json_object_from_fd(d); json_object *jso = json_object_from_fd(d);
if (jso != NULL) if (jso != NULL)
{ {
printf("FAIL: read from closed fd returning non-NULL: %p\n", jso); printf("FAIL: read from closed fd returning non-NULL: 0x%lx\n", (unsigned long)jso);
fflush(stdout); fflush(stdout);
printf(" jso=%s\n", json_object_to_json_string(jso)); printf(" jso=%s\n", json_object_to_json_string(jso));
json_object_put(jso); json_object_put(jso);
return; return;
} }
printf("OK: json_object_from_fd(closed_fd), expecting NULL, EBADF, got:%p, %s\n", jso, json_util_get_last_err()); printf("OK: json_object_from_fd(closed_fd), expecting NULL, EBADF, got:0x%lx, %s\n", (unsigned long)jso, json_util_get_last_err());
} }