X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=5dd674cf24796b4c78de42378a92dccf981be0b6;hb=808f54945bd554bdfb43e1efc2cdf6de18aefc4c;hp=61893ff3c14d615ce8cb6ed94784bb50ebdaac3a;hpb=5c416628a579131d57e75f217bfb7845a66fe62f;p=collectd.git

diff --git a/src/write_redis.c b/src/write_redis.c
index 61893ff3..5dd674cf 100644
--- a/src/write_redis.c
+++ b/src/write_redis.c
@@ -59,7 +59,6 @@ static int wr_write (const data_set_t *ds, /* {{{ */
   size_t value_size;
   char *value_ptr;
   int status;
-  int i;
 
   status = FORMAT_VL (ident, sizeof (ident), vl);
   if (status != 0)
@@ -70,40 +69,9 @@ static int wr_write (const data_set_t *ds, /* {{{ */
   value_size = sizeof (value);
   value_ptr = &value[0];
 
-#define APPEND(...) do {                                             \
-  status = snprintf (value_ptr, value_size, __VA_ARGS__);            \
-  if (((size_t) status) > value_size)                                \
-  {                                                                  \
-    value_ptr += value_size;                                         \
-    value_size = 0;                                                  \
-  }                                                                  \
-  else                                                               \
-  {                                                                  \
-    value_ptr += status;                                             \
-    value_size -= status;                                            \
-  }                                                                  \
-} while (0)
-
-  APPEND ("%.3f:", CDTIME_T_TO_DOUBLE (vl->time));
-  for (i = 0; i < ds->ds_num; i++)
-  {
-    // Increase parsability by delimiting the individual values
-    if (ds->ds_num > 1 && i > 0)
-      APPEND ("%s", "|");
-
-    if (ds->ds[i].type == DS_TYPE_COUNTER)
-      APPEND ("%llu", vl->values[i].counter);
-    else if (ds->ds[i].type == DS_TYPE_GAUGE)
-      APPEND (GAUGE_FORMAT, vl->values[i].gauge);
-    else if (ds->ds[i].type == DS_TYPE_DERIVE)
-      APPEND ("%"PRIi64, vl->values[i].derive);
-    else if (ds->ds[i].type == DS_TYPE_ABSOLUTE)
-      APPEND ("%"PRIu64, vl->values[i].absolute);
-    else
-      assert (23 == 42);
-  }
-
-#undef APPEND
+  status = format_values (value_ptr, value_size, ds, vl, /* store rates = */ 0);
+  if (status != 0)
+    return (status);
 
   pthread_mutex_lock (&node->lock);