Merge branch 'collectd-4.10' into collectd-5.0

[collectd.git] / src / utils_format_json.c

diff --git a/src/utils_format_json.c b/src/utils_format_json.c
index 1ab03e1..2a5526b 100644 (file)
--- 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 ("]");
 
@@ -269,8 +264,8 @@ static int value_list_to_json (char *buffer, size_t buffer_size, /* {{{ */
     return (status);
   BUFFER_ADD (",\"dsnames\":%s", temp);
 
-  BUFFER_ADD (",\"time\":%lu", (unsigned long) vl->time);
-  BUFFER_ADD (",\"interval\":%i", vl->interval);
+  BUFFER_ADD (",\"time\":%.3f", CDTIME_T_TO_DOUBLE (vl->time));
+  BUFFER_ADD (",\"interval\":%.3f", CDTIME_T_TO_DOUBLE (vl->interval));
 
 #define BUFFER_ADD_KEYVAL(key, value) do { \
   status = escape_string (temp, sizeof (temp), (value)); \