X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdaemon%2Futils_threshold.c;h=8c03341148af5931269f8d088cad132be04affb4;hb=9c6c1bdb92537f307d245c52349d3f196ec4d33d;hp=ad832f544efbeba59a27c6736e07beffaeed98ab;hpb=936c450a86c841eea89888c8550c9118fae90c25;p=collectd.git diff --git a/src/daemon/utils_threshold.c b/src/daemon/utils_threshold.c index ad832f54..8c033411 100644 --- a/src/daemon/utils_threshold.c +++ b/src/daemon/utils_threshold.c @@ -58,9 +58,9 @@ threshold_t *threshold_get(const char *hostname, const char *plugin, name[sizeof(name) - 1] = '\0'; if (c_avl_get(threshold_tree, name, (void *)&th) == 0) - return (th); + return th; else - return (NULL); + return NULL; } /* }}} threshold_t *threshold_get */ /* @@ -76,39 +76,39 @@ threshold_t *threshold_search(const value_list_t *vl) { /* {{{ */ if ((th = threshold_get(vl->host, vl->plugin, vl->plugin_instance, vl->type, vl->type_instance)) != NULL) - return (th); + return th; else if ((th = threshold_get(vl->host, vl->plugin, vl->plugin_instance, vl->type, NULL)) != NULL) - return (th); + return th; else if ((th = threshold_get(vl->host, vl->plugin, NULL, vl->type, vl->type_instance)) != NULL) - return (th); + return th; else if ((th = threshold_get(vl->host, vl->plugin, NULL, vl->type, NULL)) != NULL) - return (th); + return th; else if ((th = threshold_get(vl->host, "", NULL, vl->type, vl->type_instance)) != NULL) - return (th); + return th; else if ((th = threshold_get(vl->host, "", NULL, vl->type, NULL)) != NULL) - return (th); + return th; else if ((th = threshold_get("", vl->plugin, vl->plugin_instance, vl->type, vl->type_instance)) != NULL) - return (th); + return th; else if ((th = threshold_get("", vl->plugin, vl->plugin_instance, vl->type, NULL)) != NULL) - return (th); + return th; else if ((th = threshold_get("", vl->plugin, NULL, vl->type, vl->type_instance)) != NULL) - return (th); + return th; else if ((th = threshold_get("", vl->plugin, NULL, vl->type, NULL)) != NULL) - return (th); + return th; else if ((th = threshold_get("", "", NULL, vl->type, vl->type_instance)) != NULL) - return (th); + return th; else if ((th = threshold_get("", "", NULL, vl->type, NULL)) != NULL) - return (th); + return th; - return (NULL); + return NULL; } /* }}} threshold_t *threshold_search */ int ut_search_threshold(const value_list_t *vl, /* {{{ */ @@ -116,14 +116,14 @@ int ut_search_threshold(const value_list_t *vl, /* {{{ */ threshold_t *t; if (vl == NULL) - return (EINVAL); + return EINVAL; /* Is this lock really necessary? */ pthread_mutex_lock(&threshold_lock); t = threshold_search(vl); if (t == NULL) { pthread_mutex_unlock(&threshold_lock); - return (ENOENT); + return ENOENT; } memcpy(ret_threshold, t, sizeof(*ret_threshold)); @@ -131,5 +131,5 @@ int ut_search_threshold(const value_list_t *vl, /* {{{ */ ret_threshold->next = NULL; - return (0); + return 0; } /* }}} int ut_search_threshold */