37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From e8cec5c9e47676ebc51f1ab0af904fc4417b2166 Mon Sep 17 00:00:00 2001
|
|
From: Darjan Krijan <darjan_krijan@gmx.de>
|
|
Date: Tue, 20 Nov 2018 22:21:27 +0100
|
|
Subject: [PATCH 40/56] Fixed misalignment in JSON string due to space after \n
|
|
being printed when choosing JSON_C_TO_STRING_SPACED together with
|
|
JSON_C_TO_STRING_PRETTY in json_object_array_to_json_string
|
|
|
|
---
|
|
json_object.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/json_object.c b/json_object.c
|
|
index 8a86bc6..19f9c83 100644
|
|
--- a/json_object.c
|
|
+++ b/json_object.c
|
|
@@ -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, /*{*/ "}");
|
|
--
|
|
1.8.3.1
|
|
|