From 2374148c29a4ff6aa8c95a517447fbf9035b9f44 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Tue, 23 May 2017 19:59:28 -0600 Subject: [PATCH] Revert "Fixed json_print_value so that ending double quote of JSON string value will not disappear" This reverts commit 002e57665ed7eebe920de6f1729ef2e403b7c6cc. This commit breaks client/server with json output, since buf == NULL for that case. --- json.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/json.c b/json.c index 2160d296..e0227ec6 100644 --- a/json.c +++ b/json.c @@ -340,13 +340,9 @@ static void json_print_array(struct json_array *array, struct buf_output *out) static void json_print_value(struct json_value *value, struct buf_output *out) { switch (value->type) { - case JSON_TYPE_STRING: { - const char delimiter = '"'; - buf_output_add(out, &delimiter, sizeof(delimiter)); - buf_output_add(out, value->string, strlen(value->string)); - buf_output_add(out, &delimiter, sizeof(delimiter)); - break; - } + case JSON_TYPE_STRING: + log_buf(out, "\"%s\"", value->string); + break; case JSON_TYPE_INTEGER: log_buf(out, "%lld", value->integer_number); break; -- 2.25.1