From 8f7b3f2f73e20e7a43c0fbbbc053beb9ef50f1ec Mon Sep 17 00:00:00 2001 From: Brian Kelly Date: Wed, 15 Jul 2015 11:40:18 -0400 Subject: [PATCH] write_redis plugin: Remove old zadd command formatting code that should not be there to fix sorted set key names --- src/write_redis.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/src/write_redis.c b/src/write_redis.c index 2a6f9124..da5b7bbe 100644 --- a/src/write_redis.c +++ b/src/write_redis.c @@ -62,7 +62,6 @@ static int wr_write (const data_set_t *ds, /* {{{ */ char *value_ptr; int status; redisReply *rr; - int i; status = FORMAT_VL (ident, sizeof (ident), vl); if (status != 0) @@ -73,39 +72,6 @@ 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 ("%s:", time); - - for (i = 0; i < ds->ds_num; i++) - { - 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); pthread_mutex_lock (&node->lock); if (status != 0) -- 2.11.0