X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fwrite_redis.c;h=da5b7bbe8ba1ffa84ddae9ab8e2fc5325c7a69ad;hb=0a63e4493d92f7d739a1849bc65d4e971b047004;hp=2a6f9124aee0f9a66e3c6a004d8456442d7a067b;hpb=79593ed5e0a3def8e91be5b1de15a536af2d4a92;p=collectd.git 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)