X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_format_json.c;h=ac88c0fa27c4f7ae4b50cd734d78f886a79482b3;hb=badb3170d265b9b40ce6a116126f249dd313a429;hp=1ab03e1e26f4154aa35959153ffc224ed6fe0058;hpb=f33130433732951c8495cfd4e66fea47cf0fa248;p=collectd.git diff --git a/src/utils_format_json.c b/src/utils_format_json.c index 1ab03e1e..ac88c0fa 100644 --- a/src/utils_format_json.c +++ b/src/utils_format_json.c @@ -168,7 +168,7 @@ static int dstypes_to_json (char *buffer, size_t buffer_size, /* {{{ */ else if (((size_t) status) >= (buffer_size - offset)) \ return (-ENOMEM); \ else \ - offset += ((size_t) status); \ + offset += ((size_t) status); \ } while (0) BUFFER_ADD ("["); @@ -177,9 +177,7 @@ static int dstypes_to_json (char *buffer, size_t buffer_size, /* {{{ */ if (i > 0) BUFFER_ADD (","); - BUFFER_ADD ("\""); - BUFFER_ADD(DS_TYPE_TO_STRING(ds->ds[i].type)); - BUFFER_ADD ("\""); + BUFFER_ADD ("\"%s\"", DS_TYPE_TO_STRING (ds->ds[i].type)); } /* for ds->ds_num */ BUFFER_ADD ("]"); @@ -207,7 +205,7 @@ static int dsnames_to_json (char *buffer, size_t buffer_size, /* {{{ */ else if (((size_t) status) >= (buffer_size - offset)) \ return (-ENOMEM); \ else \ - offset += ((size_t) status); \ + offset += ((size_t) status); \ } while (0) BUFFER_ADD ("["); @@ -216,10 +214,7 @@ static int dsnames_to_json (char *buffer, size_t buffer_size, /* {{{ */ if (i > 0) BUFFER_ADD (","); - BUFFER_ADD ("\""); - BUFFER_ADD(ds->ds[i].name); - BUFFER_ADD ("\""); - + BUFFER_ADD ("\"%s\"", ds->ds[i].name); } /* for ds->ds_num */ BUFFER_ADD ("]");