From 1fc8ef7784730f6da37b3648fdeb4772d16cb4a9 Mon Sep 17 00:00:00 2001 From: "brianpkelly (no email)" Date: Thu, 11 Jun 2015 09:52:22 -0500 Subject: [PATCH] write_redis: Increase parsability by using format_values from common.h --- src/write_redis.c | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/src/write_redis.c b/src/write_redis.c index 61893ff3..29253524 100644 --- a/src/write_redis.c +++ b/src/write_redis.c @@ -69,41 +69,7 @@ static int wr_write (const data_set_t *ds, /* {{{ */ memset (value, 0, sizeof (value)); 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 + format_values(value_ptr, value_size, ds, vl, 0); pthread_mutex_lock (&node->lock); -- 2.11.0