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

Merge pull request #453 from darjankrijan/master

Browse Source 
Fixed misalignment in JSON string due to space after \n being printed...
This commit is contained in:
Eric Haszlakiewicz
2018-12-11 20:17:43 -05:00
committed by GitHub
parent 240627f260 9c4b07faec
commit ee4691c9fb
8 changed files with 255 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
json_object.c
View File

@@ -395,7 +395,7 @@ static int json_object_object_to_json_string(struct json_object* jso,
printbuf_strappend(pb, "\n");
}
had_children = 1;
if (flags & JSON_C_TO_STRING_SPACED)
if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY))
printbuf_strappend(pb, " ");
indent(pb, level+1, flags);
printbuf_strappend(pb, "\"");
@@ -416,7 +416,7 @@ static int json_object_object_to_json_string(struct json_object* jso,
printbuf_strappend(pb, "\n");
indent(pb,level,flags);
}
if (flags & JSON_C_TO_STRING_SPACED)
if (flags & JSON_C_TO_STRING_SPACED && !(flags & JSON_C_TO_STRING_PRETTY))
return printbuf_strappend(pb, /*{*/ " }");
else
return printbuf_strappend(pb, /*{*/ "}");
@@ -1134,7 +1134,7 @@ static int json_object_array_to_json_string(struct json_object* jso,
printbuf_strappend(pb, "\n");
}
had_children = 1;
if (flags & JSON_C_TO_STRING_SPACED)
if (flags & JSON_C_TO_STRING_SPACED && !(flags&JSON_C_TO_STRING_PRETTY))
printbuf_strappend(pb, " ");
indent(pb, level + 1, flags);
val = json_object_array_get_idx(jso, ii);
@@ -1151,7 +1151,7 @@ static int json_object_array_to_json_string(struct json_object* jso,
indent(pb,level,flags);
}
if (flags & JSON_C_TO_STRING_SPACED)
if (flags & JSON_C_TO_STRING_SPACED && !(flags&JSON_C_TO_STRING_PRETTY))
return printbuf_strappend(pb, " ]");
return printbuf_strappend(pb, "]");
}