From 7cd734dfe427019dcb06cb28e68c0965614b2259 Mon Sep 17 00:00:00 2001 From: Marc Frei Date: Mon, 8 Jan 2024 18:43:37 +0100 Subject: [PATCH] cleanup: clean up use of *free functions with return type void (#38) (Also fix one occurence of `(void)synchronize_worker`.) --- src/config.c | 18 +++++++++--------- src/keymanager.c | 20 ++++++++++---------- src/lib/table/asdict.c | 4 ++-- src/main.c | 2 +- src/ratelimiter.c | 2 +- src/test/keymanager_test.c | 4 ++-- src/test/ratelimiter_test.c | 4 ++-- src/test/rcu_test.c | 2 +- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/config.c b/src/config.c index b46d7e3..af573e4 100644 --- a/src/config.c +++ b/src/config.c @@ -816,7 +816,7 @@ lf_config_new_from_file(const char *filename) if (fread(file_content, file_size, 1, file) != 1) { LF_LOG(ERR, "Unable to read content of %s\n", filename); (void)fclose(file); - (void)free(file_content); + free(file_content); return NULL; } @@ -825,29 +825,29 @@ lf_config_new_from_file(const char *filename) /* Initialize config struct. Set all to 0. */ config = lf_config_new(); if (config == NULL) { - (void)free(file_content); + free(file_content); return NULL; } json_val = json_parse(file_content, file_size); if (json_val == NULL) { LF_LOG(ERR, "Unable to parse json.\n"); - (void)free(file_content); - (void)free(config); + free(file_content); + free(config); return NULL; } res = parse_config(json_val, config); if (res != 0) { LF_LOG(ERR, "Unable to parse config.\n"); - (void)free(file_content); - (void)free(config); - (void)json_value_free(json_val); + free(file_content); + free(config); + json_value_free(json_val); return NULL; } - (void)free(file_content); - (void)json_value_free(json_val); + free(file_content); + json_value_free(json_val); return config; } diff --git a/src/keymanager.c b/src/keymanager.c index 6596547..a6fffb0 100644 --- a/src/keymanager.c +++ b/src/keymanager.c @@ -184,7 +184,7 @@ lf_keymanager_service_update(struct lf_keymanager *km) ns_now + LF_DRKEY_PREFETCHING_PERIOD, &new_data->inbound_key); if (key_id < 0) { - (void)rte_free(new_data); + rte_free(new_data); err = -1; goto exit; } @@ -232,7 +232,7 @@ lf_keymanager_service_update(struct lf_keymanager *km) ns_now + LF_DRKEY_PREFETCHING_PERIOD, &new_data->outbound_key); if (key_id < 0) { - (void)rte_free(new_data); + rte_free(new_data); err = -1; goto exit; } @@ -259,8 +259,8 @@ lf_keymanager_service_update(struct lf_keymanager *km) exit: if (free_list != NULL) { /* free old data after no worker accesses it anymore */ - (void)synchronize_worker(km); - (void)linked_list_free(free_list); + synchronize_worker(km); + linked_list_free(free_list); } if (err != 0) { LF_KEYMANAGER_LOG(ERR, "Error occurred during update (err = %d)\n", @@ -340,7 +340,7 @@ key_dictionary_init(uint32_t size) if (dic == NULL) { LF_KEYMANAGER_LOG(ERR, "Hash creation failed with: %d\n", errno); - (void)rte_hash_free(dic); + rte_hash_free(dic); return NULL; } @@ -361,9 +361,9 @@ key_dictionary_free(struct rte_hash *dict) for (iterator = 0; rte_hash_iterate(dict, (void *)&key_ptr, (void **)&data, &iterator) >= 0;) { - (void)rte_free(data); + rte_free(data); } - (void)rte_hash_free(dict); + rte_hash_free(dict); } int @@ -475,7 +475,7 @@ lf_keymanager_apply_config(struct lf_keymanager *km, res = rte_hash_add_key_data(km->dict, &key, (void *)dictionary_data); if (res != 0) { LF_KEYMANAGER_LOG(ERR, "Add key failed with %d!\n", key_id); - (void)rte_free(dictionary_data); + rte_free(dictionary_data); err = 1; break; } @@ -488,8 +488,8 @@ lf_keymanager_apply_config(struct lf_keymanager *km, exit_unlock: if (free_list != NULL) { /* free old data after no worker accesses it anymore */ - (void)synchronize_worker(km); - (void)linked_list_free(free_list); + synchronize_worker(km); + linked_list_free(free_list); } (void)rte_spinlock_unlock(&km->management_lock); diff --git a/src/lib/table/asdict.c b/src/lib/table/asdict.c index 41645dd..f14bdd7 100644 --- a/src/lib/table/asdict.c +++ b/src/lib/table/asdict.c @@ -75,9 +75,9 @@ lf_asdict_new_with_data(int initial_size, int data_size) void lf_asdict_free(struct lf_asdict *dic) { - (void)rte_free(dic->data_array); + rte_free(dic->data_array); rte_hash_free(dic->hash_table); - (void)rte_free(dic); + rte_free(dic); } int diff --git a/src/main.c b/src/main.c index 6b2fde2..a337925 100644 --- a/src/main.c +++ b/src/main.c @@ -143,7 +143,7 @@ init_rcu_qs(uint16_t nb_qs_vars, struct rte_rcu_qsbr **qsv) /* initialize QS variable for all workers */ if (rte_rcu_qsbr_init(*qsv, nb_qs_vars) != 0) { LF_LOG(ERR, "RCU QSBR init failed\n"); - (void)rte_free(*qsv); + rte_free(*qsv); return -1; } return 0; diff --git a/src/ratelimiter.c b/src/ratelimiter.c index 02610fa..2ed9e47 100644 --- a/src/ratelimiter.c +++ b/src/ratelimiter.c @@ -81,7 +81,7 @@ dictionary_set(struct rte_hash *dict, (void *)dictionary_data); if (res != 0) { LF_RATELIMITER_LOG(ERR, "Fail to add dictionary entry.\n"); - (void)rte_free(dictionary_data); + rte_free(dictionary_data); return res; } key_id = rte_hash_lookup(dict, dictionary_key); diff --git a/src/test/keymanager_test.c b/src/test/keymanager_test.c index 8a6d52f..ed7d2ed 100644 --- a/src/test/keymanager_test.c +++ b/src/test/keymanager_test.c @@ -47,7 +47,7 @@ new_rcu_qs(uint16_t nb_workers) /* initialize QS variable for all workers */ if (rte_rcu_qsbr_init(qsv, nb_workers) != 0) { LF_LOG(ERR, "RCU QSBR init failed\n"); - (void)rte_free(qsv); + rte_free(qsv); return NULL; } return qsv; @@ -56,7 +56,7 @@ new_rcu_qs(uint16_t nb_workers) void free_rcu_qs(struct rte_rcu_qsbr *qsv) { - (void)rte_free(qsv); + rte_free(qsv); } void diff --git a/src/test/ratelimiter_test.c b/src/test/ratelimiter_test.c index 27bc1c2..323f813 100644 --- a/src/test/ratelimiter_test.c +++ b/src/test/ratelimiter_test.c @@ -47,7 +47,7 @@ new_rcu_qs(uint16_t nb_workers) /* initialize QS variable for all workers */ if (rte_rcu_qsbr_init(qsv, nb_workers) != 0) { LF_LOG(ERR, "RCU QSBR init failed\n"); - (void)rte_free(qsv); + rte_free(qsv); return NULL; } return qsv; @@ -56,7 +56,7 @@ new_rcu_qs(uint16_t nb_workers) void free_rcu_qs(struct rte_rcu_qsbr *qsv) { - (void)rte_free(qsv); + rte_free(qsv); } struct lf_ratelimiter * diff --git a/src/test/rcu_test.c b/src/test/rcu_test.c index 9d2ac44..a7d4f6a 100644 --- a/src/test/rcu_test.c +++ b/src/test/rcu_test.c @@ -23,7 +23,7 @@ new_rcu_qs(uint16_t nb_workers, struct rte_rcu_qsbr **qsv) /* initialize QS variable for all workers */ if (rte_rcu_qsbr_init(*qsv, nb_workers) != 0) { printf("RCU QSBR init failed\n"); - (void)free(*qsv); + free(*qsv); return -1; }