X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_format_graphite.c;h=44700b5477f78856f81c095e39e541d54e34de72;hb=7f07c55bac640c7a50d516248a3152235a14af59;hp=f124ba10cf5fd2511ac957c73ac98754e5046a47;hpb=867ad628dc6fcd05bd584b605d7093cfc00c3d07;p=collectd.git diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c index f124ba10..44700b54 100644 --- a/src/utils_format_graphite.c +++ b/src/utils_format_graphite.c @@ -46,7 +46,7 @@ static int gr_format_values(char *ret, size_t ret_len, int ds_num, #define BUFFER_ADD(...) \ do { \ - status = ssnprintf(ret + offset, ret_len - offset, __VA_ARGS__); \ + status = snprintf(ret + offset, ret_len - offset, __VA_ARGS__); \ if (status < 1) { \ return -1; \ } else if (((size_t)status) >= (ret_len - offset)) { \ @@ -60,14 +60,14 @@ static int gr_format_values(char *ret, size_t ret_len, int ds_num, else if (rates != NULL) BUFFER_ADD("%f", rates[ds_num]); else if (ds->ds[ds_num].type == DS_TYPE_COUNTER) - BUFFER_ADD("%llu", vl->values[ds_num].counter); + BUFFER_ADD("%" PRIu64, (uint64_t)vl->values[ds_num].counter); else if (ds->ds[ds_num].type == DS_TYPE_DERIVE) BUFFER_ADD("%" PRIi64, vl->values[ds_num].derive); else if (ds->ds[ds_num].type == DS_TYPE_ABSOLUTE) BUFFER_ADD("%" PRIu64, vl->values[ds_num].absolute); else { - ERROR("gr_format_values plugin: Unknown data source type: %i", - ds->ds[ds_num].type); + P_ERROR("gr_format_values: Unknown data source type: %i", + ds->ds[ds_num].type); return -1; } @@ -77,7 +77,7 @@ static int gr_format_values(char *ret, size_t ret_len, int ds_num, } static void gr_copy_escape_part(char *dst, const char *src, size_t dst_len, - char escape_char, _Bool preserve_separator) { + char escape_char, bool preserve_separator) { memset(dst, 0, dst_len); if (src == NULL) @@ -116,7 +116,7 @@ static int gr_format_name(char *ret, int ret_len, value_list_t const *vl, if (postfix == NULL) postfix = ""; - _Bool preserve_separator = (flags & GRAPHITE_PRESERVE_SEPARATOR) ? 1 : 0; + bool preserve_separator = (flags & GRAPHITE_PRESERVE_SEPARATOR); gr_copy_escape_part(n_host, vl->host, sizeof(n_host), escape_char, preserve_separator); @@ -131,9 +131,9 @@ static int gr_format_name(char *ret, int ret_len, value_list_t const *vl, sizeof(n_type_instance), escape_char, preserve_separator); if (n_plugin_instance[0] != '\0') - ssnprintf(tmp_plugin, sizeof(tmp_plugin), "%s%c%s", n_plugin, - (flags & GRAPHITE_SEPARATE_INSTANCES) ? '.' : '-', - n_plugin_instance); + snprintf(tmp_plugin, sizeof(tmp_plugin), "%s%c%s", n_plugin, + (flags & GRAPHITE_SEPARATE_INSTANCES) ? '.' : '-', + n_plugin_instance); else sstrncpy(tmp_plugin, n_plugin, sizeof(tmp_plugin)); @@ -141,9 +141,9 @@ static int gr_format_name(char *ret, int ret_len, value_list_t const *vl, if ((flags & GRAPHITE_DROP_DUPE_FIELDS) && strcmp(n_plugin, n_type) == 0) sstrncpy(tmp_type, n_type_instance, sizeof(tmp_type)); else - ssnprintf(tmp_type, sizeof(tmp_type), "%s%c%s", n_type, - (flags & GRAPHITE_SEPARATE_INSTANCES) ? '.' : '-', - n_type_instance); + snprintf(tmp_type, sizeof(tmp_type), "%s%c%s", n_type, + (flags & GRAPHITE_SEPARATE_INSTANCES) ? '.' : '-', + n_type_instance); } else sstrncpy(tmp_type, n_type, sizeof(tmp_type)); @@ -152,14 +152,14 @@ static int gr_format_name(char *ret, int ret_len, value_list_t const *vl, if (ds_name != NULL) { if ((flags & GRAPHITE_DROP_DUPE_FIELDS) && strcmp(tmp_plugin, tmp_type) == 0) - ssnprintf(ret, ret_len, "%s%s%s.%s.%s", prefix, n_host, postfix, - tmp_plugin, ds_name); + snprintf(ret, ret_len, "%s%s%s.%s.%s", prefix, n_host, postfix, + tmp_plugin, ds_name); else - ssnprintf(ret, ret_len, "%s%s%s.%s.%s.%s", prefix, n_host, postfix, - tmp_plugin, tmp_type, ds_name); + snprintf(ret, ret_len, "%s%s%s.%s.%s.%s", prefix, n_host, postfix, + tmp_plugin, tmp_type, ds_name); } else - ssnprintf(ret, ret_len, "%s%s%s.%s.%s", prefix, n_host, postfix, tmp_plugin, - tmp_type); + snprintf(ret, ret_len, "%s%s%s.%s.%s", prefix, n_host, postfix, tmp_plugin, + tmp_type); return 0; } @@ -183,7 +183,7 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds, if (flags & GRAPHITE_STORE_RATES) { rates = uc_get_rate(ds, vl); if (rates == NULL) { - ERROR("format_graphite: error with uc_get_rate"); + P_ERROR("format_graphite: error with uc_get_rate"); return -1; } } @@ -202,7 +202,7 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds, status = gr_format_name(key, sizeof(key), vl, ds_name, prefix, postfix, escape_char, flags); if (status != 0) { - ERROR("format_graphite: error with gr_format_name"); + P_ERROR("format_graphite: error with gr_format_name"); sfree(rates); return status; } @@ -212,26 +212,26 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds, * `values'. */ status = gr_format_values(values, sizeof(values), i, ds, vl, rates); if (status != 0) { - ERROR("format_graphite: error with gr_format_values"); + P_ERROR("format_graphite: error with gr_format_values"); sfree(rates); return status; } /* Compute the graphite command */ message_len = - (size_t)ssnprintf(message, sizeof(message), "%s %s %u\r\n", key, values, - (unsigned int)CDTIME_T_TO_TIME_T(vl->time)); + (size_t)snprintf(message, sizeof(message), "%s %s %u\r\n", key, values, + (unsigned int)CDTIME_T_TO_TIME_T(vl->time)); if (message_len >= sizeof(message)) { - ERROR("format_graphite: message buffer too small: " - "Need %zu bytes.", - message_len + 1); + P_ERROR("format_graphite: message buffer too small: " + "Need %" PRIsz " bytes.", + message_len + 1); sfree(rates); return -ENOMEM; } /* Append it in case we got multiple data set */ if ((buffer_pos + message_len) >= buffer_size) { - ERROR("format_graphite: target buffer too small"); + P_ERROR("format_graphite: target buffer too small"); sfree(rates); return -ENOMEM; }