X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_rrdcreate.c;h=6cb544637aa5c3e7a3d1d7075e4a038a9123907b;hb=e746ad785774de37a30302fef65f1c4aaf8698ab;hp=86f7f3fbaace5f9929929a1471e8c342669e4511;hpb=47c86ace348a1d7a5352a83d10935209f89aa4f5;p=collectd.git diff --git a/src/utils_rrdcreate.c b/src/utils_rrdcreate.c index 86f7f3fb..6cb54463 100644 --- a/src/utils_rrdcreate.c +++ b/src/utils_rrdcreate.c @@ -208,8 +208,8 @@ static int rra_get(char ***ret, const value_list_t *vl, /* {{{ */ if (rra_num >= rra_max) break; - status = ssnprintf(buffer, sizeof(buffer), "RRA:%s:%.10f:%u:%u", - rra_types[j], cfg->xff, cdp_len, cdp_num); + status = snprintf(buffer, sizeof(buffer), "RRA:%s:%.10f:%u:%u", + rra_types[j], cfg->xff, cdp_len, cdp_num); if ((status < 0) || ((size_t)status >= sizeof(buffer))) { ERROR("rra_get: Buffer would have been truncated."); @@ -280,18 +280,18 @@ static int ds_get(char ***ret, /* {{{ */ if (isnan(d->min)) { sstrncpy(min, "U", sizeof(min)); } else - ssnprintf(min, sizeof(min), "%f", d->min); + snprintf(min, sizeof(min), "%f", d->min); if (isnan(d->max)) { sstrncpy(max, "U", sizeof(max)); } else - ssnprintf(max, sizeof(max), "%f", d->max); + snprintf(max, sizeof(max), "%f", d->max); - status = ssnprintf(buffer, sizeof(buffer), "DS:%s:%s:%i:%s:%s", d->name, - type, (cfg->heartbeat > 0) - ? cfg->heartbeat - : (int)CDTIME_T_TO_TIME_T(2 * vl->interval), - min, max); + status = snprintf( + buffer, sizeof(buffer), "DS:%s:%s:%i:%s:%s", d->name, type, + (cfg->heartbeat > 0) ? cfg->heartbeat + : (int)CDTIME_T_TO_TIME_T(2 * vl->interval), + min, max); if ((status < 1) || ((size_t)status >= sizeof(buffer))) break; @@ -369,8 +369,8 @@ static int srrd_create(const char *filename, /* {{{ */ if (last_up == 0) last_up = time(NULL) - 10; - ssnprintf(pdp_step_str, sizeof(pdp_step_str), "%lu", pdp_step); - ssnprintf(last_up_str, sizeof(last_up_str), "%lu", (unsigned long)last_up); + snprintf(pdp_step_str, sizeof(pdp_step_str), "%lu", pdp_step); + snprintf(last_up_str, sizeof(last_up_str), "%lu", (unsigned long)last_up); new_argv[0] = "create"; new_argv[1] = (void *)filename; @@ -497,7 +497,7 @@ static void *srrd_create_thread(void *targs) /* {{{ */ return 0; } - ssnprintf(tmpfile, sizeof(tmpfile), "%s.async", args->filename); + snprintf(tmpfile, sizeof(tmpfile), "%s.async", args->filename); status = srrd_create(tmpfile, args->pdp_step, args->last_up, args->argc, (void *)args->argv);