X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_format_kairosdb.c;h=d957bc800e8a8d8b20860ca90cc22b3e53728984;hb=711f5b6c86f51061c21bedcaa46214a01de0125c;hp=460f807a5631c5be49f75f8efe68c2e3452882fa;hpb=3d082a905619c19ca5b7183bb95a30d4d9529c4d;p=collectd.git diff --git a/src/utils_format_kairosdb.c b/src/utils_format_kairosdb.c index 460f807a..d957bc80 100644 --- a/src/utils_format_kairosdb.c +++ b/src/utils_format_kairosdb.c @@ -69,7 +69,7 @@ static int kairosdb_escape_string(char *buffer, size_t buffer_size, /* {{{ */ #define BUFFER_ADD(c) \ do { \ if (dst_pos >= (buffer_size - 1)) { \ - buffer[buffer_size - 1] = 0; \ + buffer[buffer_size - 1] = '\0'; \ return -ENOMEM; \ } \ buffer[dst_pos] = (c); \ @@ -154,7 +154,7 @@ static int values_to_kairosdb(char *buffer, size_t buffer_size, /* {{{ */ BUFFER_ADD("[["); BUFFER_ADD("%" PRIu64, CDTIME_T_TO_MS(vl->time)); BUFFER_ADD(","); - BUFFER_ADD("%llu", vl->values[ds_idx].counter); + BUFFER_ADD("%" PRIu64, (uint64_t)vl->values[ds_idx].counter); } else if (ds->ds[ds_idx].type == DS_TYPE_DERIVE) { BUFFER_ADD("[["); BUFFER_ADD("%" PRIu64, CDTIME_T_TO_MS(vl->time)); @@ -356,5 +356,3 @@ int format_kairosdb_value_list(char *buffer, /* {{{ */ (*ret_buffer_free) - 2, http_attrs, http_attrs_num, data_ttl, metrics_prefix); } /* }}} int format_kairosdb_value_list */ - -/* vim: set sw=2 sts=2 et fdm=marker : */