From 28b7926cb56bdd27df6f06b094a4ef814a416a33 Mon Sep 17 00:00:00 2001 From: Costa Tsaousis Date: Thu, 11 Jan 2024 21:40:05 +0200 Subject: fix compiler warnings (#16763) --- daemon/config/dyncfg-echo.c | 2 +- daemon/config/dyncfg-inline.c | 2 +- daemon/config/dyncfg-intercept.c | 2 +- daemon/config/dyncfg-tree.c | 2 +- daemon/config/dyncfg-unittest.c | 4 ++-- daemon/config/dyncfg.c | 2 +- libnetdata/simple_hashtable.h | 2 +- web/server/web_client.c | 2 +- web/server/web_client.h | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/daemon/config/dyncfg-echo.c b/daemon/config/dyncfg-echo.c index 203e9f108f..16785fde11 100644 --- a/daemon/config/dyncfg-echo.c +++ b/daemon/config/dyncfg-echo.c @@ -16,7 +16,7 @@ struct dyncfg_echo { BUFFER *wb; }; -void dyncfg_echo_cb(BUFFER *wb __maybe_unused, int code, void *result_cb_data) { +void dyncfg_echo_cb(BUFFER *wb __maybe_unused, int code __maybe_unused, void *result_cb_data) { struct dyncfg_echo *e = result_cb_data; buffer_free(e->wb); diff --git a/daemon/config/dyncfg-inline.c b/daemon/config/dyncfg-inline.c index 8039563403..cc38318885 100644 --- a/daemon/config/dyncfg-inline.c +++ b/daemon/config/dyncfg-inline.c @@ -4,7 +4,7 @@ static DICTIONARY *dyncfg_nodes = NULL; -static int dyncfg_inline_callback(struct rrd_function_execute *rfe, void *data) { +static int dyncfg_inline_callback(struct rrd_function_execute *rfe, void *data __maybe_unused) { char tr[UUID_COMPACT_STR_LEN]; uuid_unparse_lower_compact(*rfe->transaction, tr); diff --git a/daemon/config/dyncfg-intercept.c b/daemon/config/dyncfg-intercept.c index acfb89fbba..27964155d8 100644 --- a/daemon/config/dyncfg-intercept.c +++ b/daemon/config/dyncfg-intercept.c @@ -157,7 +157,7 @@ static void dyncfg_apply_action_on_all_template_jobs(const char *template_id, DY DYNCFG *df; dfe_start_reentrant(dyncfg_globals.nodes, df) { if(df->template == template && df->type == DYNCFG_TYPE_JOB) { - DYNCFG_STATUS cmd_to_send_to_plugin = c; + DYNCFG_CMDS cmd_to_send_to_plugin = c; if(c == DYNCFG_CMD_ENABLE) cmd_to_send_to_plugin = df->user_disabled ? DYNCFG_CMD_DISABLE : DYNCFG_CMD_ENABLE; diff --git a/daemon/config/dyncfg-tree.c b/daemon/config/dyncfg-tree.c index 9cdd58d0ca..2155e4a771 100644 --- a/daemon/config/dyncfg-tree.c +++ b/daemon/config/dyncfg-tree.c @@ -46,7 +46,7 @@ static void dyncfg_to_json(DYNCFG *df, const char *id, BUFFER *wb) { buffer_json_object_close(wb); } -static void dyncfg_tree_for_host(RRDHOST *host, BUFFER *wb, const char *parent, const char *id) { +static void dyncfg_tree_for_host(RRDHOST *host, BUFFER *wb, const char *parent, const char *id __maybe_unused) { size_t entries = dictionary_entries(dyncfg_globals.nodes); size_t used = 0; const DICTIONARY_ITEM *items[entries]; diff --git a/daemon/config/dyncfg-unittest.c b/daemon/config/dyncfg-unittest.c index 4131ed433b..25838e8154 100644 --- a/daemon/config/dyncfg-unittest.c +++ b/daemon/config/dyncfg-unittest.c @@ -164,7 +164,7 @@ static int dyncfg_unittest_action(struct dyncfg_unittest_action *a) { return rc; } -static void *dyncfg_unittest_thread_action(void *ptr) { +static void *dyncfg_unittest_thread_action(void *ptr __maybe_unused) { while(1) { struct dyncfg_unittest_action *a = NULL; spinlock_lock(&dyncfg_unittest_data.spinlock); @@ -526,7 +526,7 @@ static void dyncfg_unittest_cleanup_files(void) { } struct dirent *entry; - char filename[PATH_MAX]; + char filename[FILENAME_MAX]; while ((entry = readdir(dir)) != NULL) { if ((entry->d_type == DT_REG || entry->d_type == DT_LNK) && strstartswith(entry->d_name, "unittest:") && strendswith(entry->d_name, ".dyncfg")) { snprintf(filename, sizeof(filename), "%s/%s", path, entry->d_name); diff --git a/daemon/config/dyncfg.c b/daemon/config/dyncfg.c index 143c656797..2dc7edd282 100644 --- a/daemon/config/dyncfg.c +++ b/daemon/config/dyncfg.c @@ -323,7 +323,7 @@ bool dyncfg_add_low_level(RRDHOST *host, const char *id, const char *path, DYNCF dyncfg_function_intercept_cb, NULL); - DYNCFG_STATUS status_to_send_to_plugin = df->user_disabled ? DYNCFG_CMD_DISABLE : DYNCFG_CMD_ENABLE; + DYNCFG_CMDS status_to_send_to_plugin = df->user_disabled ? DYNCFG_CMD_DISABLE : DYNCFG_CMD_ENABLE; if(status_to_send_to_plugin == DYNCFG_CMD_ENABLE && dyncfg_is_user_disabled(string2str(df->template))) status_to_send_to_plugin = DYNCFG_CMD_DISABLE; diff --git a/libnetdata/simple_hashtable.h b/libnetdata/simple_hashtable.h index af1b3cf31c..13cdcd10e6 100644 --- a/libnetdata/simple_hashtable.h +++ b/libnetdata/simple_hashtable.h @@ -245,7 +245,7 @@ static inline void simple_hashtable_del_value_sorted_named(SIMPLE_HASHTABLE_NAME static inline void simple_hashtable_replace_value_sorted_named(SIMPLE_HASHTABLE_NAMED *ht __maybe_unused, SIMPLE_HASHTABLE_VALUE_TYPE *old_value __maybe_unused, SIMPLE_HASHTABLE_VALUE_TYPE *new_value __maybe_unused) { ; } #endif -static void simple_hashtable_init_named(SIMPLE_HASHTABLE_NAMED *ht, size_t size) { +static inline void simple_hashtable_init_named(SIMPLE_HASHTABLE_NAMED *ht, size_t size) { memset(ht, 0, sizeof(*ht)); ht->size = size; ht->hashtable = callocz(ht->size, sizeof(*ht->hashtable)); diff --git a/web/server/web_client.c b/web/server/web_client.c index a3d028c37c..7928446b16 100644 --- a/web/server/web_client.c +++ b/web/server/web_client.c @@ -183,7 +183,7 @@ static void web_client_reset_allocations(struct web_client *w, bool free_all) { web_client_flag_clear(w, WEB_CLIENT_CHUNKED_TRANSFER); } - web_client_flags_check_auth(w); + web_client_flags_clear_auth(w); web_client_flag_clear(w, WEB_CLIENT_ENCODING_GZIP|WEB_CLIENT_ENCODING_DEFLATE); web_client_reset_path_flags(w); } diff --git a/web/server/web_client.h b/web/server/web_client.h index 41d6cc38cf..2c36700db0 100644 --- a/web/server/web_client.h +++ b/web/server/web_client.h @@ -74,8 +74,8 @@ typedef enum __attribute__((packed)) { #define web_client_reset_path_flags(w) (w)->flags &= ~(WEB_CLIENT_FLAG_PATH_WITH_VERSION|WEB_CLIENT_FLAG_PATH_HAS_TRAILING_SLASH|WEB_CLIENT_FLAG_PATH_HAS_FILE_EXTENSION) #define web_client_flag_check(w, flag) ((w)->flags & (flag)) -#define web_client_flag_set(w, flag) (w)->flags |= flag -#define web_client_flag_clear(w, flag) (w)->flags &= ~flag +#define web_client_flag_set(w, flag) (w)->flags |= (flag) +#define web_client_flag_clear(w, flag) (w)->flags &= ~(flag) #define WEB_CLIENT_IS_DEAD(w) web_client_flag_set(w, WEB_CLIENT_FLAG_DEAD) #define web_client_check_dead(w) web_client_flag_check(w, WEB_CLIENT_FLAG_DEAD) -- cgit v1.2.3