X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Frrdcached.c;h=1e75ff8330aadd35f8d103f37d77368725700ef3;hp=125a317bbe853bc20b90b3594d51d1eadc3c7fdc;hb=a59c14adfa86c823efff87ca797c4d6e6ce32913;hpb=ce780b0b6f1f6fe3c64a63f8468fc214e517ce04 diff --git a/src/rrdcached.c b/src/rrdcached.c index 125a317b..1e75ff83 100644 --- a/src/rrdcached.c +++ b/src/rrdcached.c @@ -66,8 +66,8 @@ static int value_list_to_string(char *buffer, int buffer_len, memset(buffer, '\0', buffer_len); - time_t t = CDTIME_T_TO_TIME_T(vl->time); - int status = snprintf(buffer, buffer_len, "%lu", (unsigned long)t); + int status = + ssnprintf(buffer, buffer_len, "%.6f", CDTIME_T_TO_DOUBLE(vl->time)); if ((status < 1) || (status >= buffer_len)) return -1; int offset = status; @@ -80,17 +80,17 @@ static int value_list_to_string(char *buffer, int buffer_len, return -1; if (ds->ds[i].type == DS_TYPE_COUNTER) { - status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIu64, - (uint64_t)vl->values[i].counter); + status = ssnprintf(buffer + offset, buffer_len - offset, ":%" PRIu64, + (uint64_t)vl->values[i].counter); } else if (ds->ds[i].type == DS_TYPE_GAUGE) { - status = snprintf(buffer + offset, buffer_len - offset, ":%f", - vl->values[i].gauge); + status = ssnprintf(buffer + offset, buffer_len - offset, ":%f", + vl->values[i].gauge); } else if (ds->ds[i].type == DS_TYPE_DERIVE) { - status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIi64, - vl->values[i].derive); + status = ssnprintf(buffer + offset, buffer_len - offset, ":%" PRIi64, + vl->values[i].derive); } else /* if (ds->ds[i].type == DS_TYPE_ABSOLUTE) */ { - status = snprintf(buffer + offset, buffer_len - offset, ":%" PRIu64, - vl->values[i].absolute); + status = ssnprintf(buffer + offset, buffer_len - offset, ":%" PRIu64, + vl->values[i].absolute); } if ((status < 1) || (status >= (buffer_len - offset))) @@ -426,7 +426,8 @@ static int rc_write(const data_set_t *ds, const value_list_t *vl, } char *values_array[2] = { - [0] = values, [1] = NULL, + [0] = values, + [1] = NULL, }; while (42) { @@ -461,9 +462,9 @@ static int rc_flush(__attribute__((unused)) cdtime_t timeout, /* {{{ */ char filename[PATH_MAX + 1]; if (datadir != NULL) - snprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier); + ssnprintf(filename, sizeof(filename), "%s/%s.rrd", datadir, identifier); else - snprintf(filename, sizeof(filename), "%s.rrd", identifier); + ssnprintf(filename, sizeof(filename), "%s.rrd", identifier); rrd_clear_error(); int status = rrdc_connect(daemon_address);