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