X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_format_graphite.c;h=fd6c4e2f32548a1117fb2f93bcd1ad58cdc22efb;hb=307c875e5a78a2729fbbe1a588d232e9a129d75a;hp=4f509f4a4c649e47f5fc94a66174a341ab002f4b;hpb=51d29979b01ae0316597898f0e25d4bab7fd7d81;p=collectd.git diff --git a/src/utils_format_graphite.c b/src/utils_format_graphite.c index 4f509f4a..fd6c4e2f 100644 --- a/src/utils_format_graphite.c +++ b/src/utils_format_graphite.c @@ -48,9 +48,9 @@ static int gr_format_values(char *ret, size_t ret_len, int ds_num, do { \ status = ssnprintf(ret + offset, ret_len - offset, __VA_ARGS__); \ if (status < 1) { \ - return (-1); \ + return -1; \ } else if (((size_t)status) >= (ret_len - offset)) { \ - return (-1); \ + return -1; \ } else \ offset += ((size_t)status); \ } while (0) @@ -68,12 +68,12 @@ static int gr_format_values(char *ret, size_t ret_len, int ds_num, else { ERROR("gr_format_values plugin: Unknown data source type: %i", ds->ds[ds_num].type); - return (-1); + return -1; } #undef BUFFER_ADD - return (0); + return 0; } static void gr_copy_escape_part(char *dst, const char *src, size_t dst_len, @@ -161,7 +161,7 @@ static int gr_format_name(char *ret, int ret_len, value_list_t const *vl, ssnprintf(ret, ret_len, "%s%s%s.%s.%s", prefix, n_host, postfix, tmp_plugin, tmp_type); - return (0); + return 0; } static void escape_graphite_string(char *buffer, char escape_char) { @@ -199,7 +199,7 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds, if (status != 0) { ERROR("format_graphite: error with gr_format_name"); sfree(rates); - return (status); + return status; } escape_graphite_string(key, escape_char); @@ -209,7 +209,7 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds, if (status != 0) { ERROR("format_graphite: error with gr_format_values"); sfree(rates); - return (status); + return status; } /* Compute the graphite command */ @@ -221,21 +221,19 @@ int format_graphite(char *buffer, size_t buffer_size, data_set_t const *ds, "Need %zu bytes.", message_len + 1); sfree(rates); - return (-ENOMEM); + 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"); sfree(rates); - return (-ENOMEM); + return -ENOMEM; } memcpy((void *)(buffer + buffer_pos), message, message_len); buffer_pos += message_len; buffer[buffer_pos] = '\0'; } sfree(rates); - return (status); + return status; } /* int format_graphite */ - -/* vim: set sw=2 sts=2 et fdm=marker : */