mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qjson: Drop trailing space for pretty formatting

Browse Source 
For the pretty formatting, the functions converting QDicts and QLists to
JSON should not print a space after the comma separating objects,
because a newline will emitted immediately afterwards, making the
whitespace superfluous.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2014-11-21 10:29:59 +01:00 committed by Kevin Wolf
parent f71eaa74c0
commit 4b58554a0e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qobject/qjson.c
View File

@ -86,8 +86,9 @@ static void to_json_dict_iter(const char *key, QObject *obj, void *opaque)
QString *qkey; QString *qkey;
int j; int j;
if (s->count) if (s->count) {
qstring_append(s->str, ", "); qstring_append(s->str, s->pretty ? "," : ", ");
}
if (s->pretty) { if (s->pretty) {
qstring_append(s->str, "\n"); qstring_append(s->str, "\n");
@ -109,8 +110,9 @@ static void to_json_list_iter(QObject *obj, void *opaque)
ToJsonIterState *s = opaque; ToJsonIterState *s = opaque;
int j; int j;
if (s->count) if (s->count) {
qstring_append(s->str, ", "); qstring_append(s->str, s->pretty ? "," : ", ");
}
if (s->pretty) { if (s->pretty) {
qstring_append(s->str, "\n"); qstring_append(s->str, "\n");