mirror of
https://github.com/json-c/json-c.git
synced 2026-11-05 21:20:16 +08:00
Merge pull request #974 from sswamy48/AIX_null
AIX: Fix test_json_patch NULL pointer passed to printf
This commit is contained in:
1 file changed
+6
-1
@@ -16,6 +16,11 @@
|
|||||||
#define PATH_MAX 256
|
#define PATH_MAX 256
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* printf("%s", NULL) prints emptry string on AIX.
|
||||||
|
* Use this macro to guard all printf %s args that may be NULL*/
|
||||||
|
#define STR_OR_NULL(s) ((s) ? (s) : "(null)")
|
||||||
|
|
||||||
|
|
||||||
void test_json_patch_op(struct json_object *jo)
|
void test_json_patch_op(struct json_object *jo)
|
||||||
{
|
{
|
||||||
const char *comment = json_object_get_string(json_object_object_get(jo, "comment"));
|
const char *comment = json_object_get_string(json_object_object_get(jo, "comment"));
|
||||||
@@ -29,7 +34,7 @@ void test_json_patch_op(struct json_object *jo)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
printf("Testing '%s', doc '%s' patch '%s' : ",
|
printf("Testing '%s', doc '%s' patch '%s' : ",
|
||||||
comment ? comment : error_s,
|
STR_OR_NULL(comment ? comment : error_s),
|
||||||
json_object_get_string(doc),
|
json_object_get_string(doc),
|
||||||
json_object_get_string(patch));
|
json_object_get_string(patch));
|
||||||
if (!error && !have_expected) {
|
if (!error && !have_expected) {
|
||||||
|
|||||||
Reference in new issue
Block a user