X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fthreshold.c;h=f12b405773609c89cbe37ea4e8061d93d714a706;hb=5afde1077e3c8fc119b79caa2572cbf84dbfe5ca;hp=94a4f02449c06fb8093defef6ea2a1095e556352;hpb=c89182b424bb4184bd7da3f2ab687b542ed7eea3;p=collectd.git diff --git a/src/threshold.c b/src/threshold.c index 94a4f024..f12b4057 100644 --- a/src/threshold.c +++ b/src/threshold.c @@ -30,8 +30,6 @@ #include "utils_cache.h" #include "utils_threshold.h" -#include - /* * Threshold management * ==================== @@ -872,11 +870,9 @@ static int ut_config (oconfig_item_t *ci) int status = 0; int old_size = c_avl_size (threshold_tree); - threshold_t th; - if (threshold_tree == NULL) { - threshold_tree = c_avl_create ((void *) strcmp); + threshold_tree = c_avl_create ((int (*) (const void *, const void *)) strcmp); if (threshold_tree == NULL) { ERROR ("ut_config: c_avl_create failed."); @@ -884,15 +880,13 @@ static int ut_config (oconfig_item_t *ci) } } - memset (&th, '\0', sizeof (th)); - th.warning_min = NAN; - th.warning_max = NAN; - th.failure_min = NAN; - th.failure_max = NAN; - - th.hits = 0; - th.hysteresis = 0; - th.flags = UT_FLAG_INTERESTING; /* interesting by default */ + threshold_t th = { + .warning_min = NAN, + .warning_max = NAN, + .failure_min = NAN, + .failure_max = NAN, + .flags = UT_FLAG_INTERESTING /* interesting by default */ + }; for (i = 0; i < ci->children_num; i++) {