Revert "Fixed json_print_value so that ending double quote of JSON string value will...
authorJens Axboe <axboe@fb.com>
Wed, 24 May 2017 01:59:28 +0000 (19:59 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 24 May 2017 01:59:28 +0000 (19:59 -0600)
This reverts commit 002e57665ed7eebe920de6f1729ef2e403b7c6cc.

This commit breaks client/server with json output, since buf == NULL
for that case.

json.c

diff --git a/json.c b/json.c
index 2160d29..e0227ec 100644 (file)
--- 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;