X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fwrite_riemann_threshold.c;h=35f3814a5f26b8c4d64bf47867f658fce80ac05b;hp=992d856297f58cd9d2f0620be52b254405bfc384;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=786a6be461cf58ef2b8c57974cad2a79ba2ee82c diff --git a/src/write_riemann_threshold.c b/src/write_riemann_threshold.c index 992d8562..35f3814a 100644 --- a/src/write_riemann_threshold.c +++ b/src/write_riemann_threshold.c @@ -34,8 +34,6 @@ #include "utils_threshold.h" #include "write_riemann_threshold.h" -#include - /* * Threshold management * ==================== @@ -65,7 +63,7 @@ static int ut_check_one_data_source( if (ds != NULL) { ds_name = ds->ds[ds_index].name; if ((th->data_source[0] != 0) && (strcmp(ds_name, th->data_source) != 0)) - return (STATE_OKAY); + return STATE_OKAY; } if ((th->flags & UT_FLAG_INVERT) != 0) { @@ -83,7 +81,7 @@ static int ut_check_one_data_source( ((th->failure_min + th->hysteresis) < values[ds_index])) || (!isnan(th->failure_max) && ((th->failure_max - th->hysteresis) > values[ds_index]))) - return (STATE_OKAY); + return STATE_OKAY; else is_failure++; case STATE_WARNING: @@ -91,7 +89,7 @@ static int ut_check_one_data_source( ((th->warning_min + th->hysteresis) < values[ds_index])) || (!isnan(th->warning_max) && ((th->warning_max - th->hysteresis) > values[ds_index]))) - return (STATE_OKAY); + return STATE_OKAY; else is_warning++; } @@ -106,12 +104,12 @@ static int ut_check_one_data_source( } if (is_failure != 0) - return (STATE_ERROR); + return STATE_ERROR; if (is_warning != 0) - return (STATE_WARNING); + return STATE_WARNING; - return (STATE_OKAY); + return STATE_OKAY; } /* }}} int ut_check_one_data_source */ /* @@ -172,7 +170,7 @@ static int ut_check_one_threshold(const data_set_t *ds, const value_list_t *vl, } } /* for (ds->ds_num) */ - return (ret); + return ret; } /* }}} int ut_check_one_threshold */ /* @@ -202,20 +200,20 @@ int write_riemann_threshold_check(const data_set_t *ds, const value_list_t *vl, th = threshold_search(vl); pthread_mutex_unlock(&threshold_lock); if (th == NULL) - return (0); + return 0; DEBUG("ut_check_threshold: Found matching threshold(s)"); values = uc_get_rate(ds, vl); if (values == NULL) - return (0); + return 0; while (th != NULL) { status = ut_check_one_threshold(ds, vl, th, values, statuses); if (status < 0) { ERROR("ut_check_threshold: ut_check_one_threshold failed."); sfree(values); - return (-1); + return -1; } th = th->next; @@ -223,5 +221,5 @@ int write_riemann_threshold_check(const data_set_t *ds, const value_list_t *vl, sfree(values); - return (0); + return 0; } /* }}} int ut_check_threshold */