From 8d5995878d8404f16a535ace7231064d16102bb5 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 25 Jan 2025 17:41:55 +0100 Subject: [PATCH] change names for config --- src/kds_s2000w_client.c | 6 +-- src/kds_s2000w_config.c | 30 +++++++-------- src/kds_s2000w_config.h | 7 ++-- tests/kds_s2000w_read_config_tests.c | 48 ++++++++++++------------ tests/kds_s2000w_read_config_tests.h | 16 ++++---- tests/kds_s2000w_read_config_tests_run.c | 16 ++++---- 6 files changed, 62 insertions(+), 61 deletions(-) diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index 316cfc8..a167e78 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -75,8 +75,8 @@ void kds_s2000w_client_init() { debug_printf(ALL, "kds_s2000w_client_init"); - char* config_stream = read_config_file(CONFIG_FILE); - config = load_config(config_stream); + char* config_stream = kds_s2000w_config_read(CONFIG_FILE); + config = kds_s2000w_load_config(config_stream); curl_global_init(CURL_GLOBAL_ALL); curl = curl_easy_init(); errbuf[0] = 0; @@ -89,7 +89,7 @@ void kds_s2000w_client_free() { debug_printf(ALL, "kds_s2000w_client_free"); - free_config(config); + kds_s2000w_config_free(config); config = NULL; curl_easy_cleanup(curl); curl = NULL; diff --git a/src/kds_s2000w_config.c b/src/kds_s2000w_config.c index 2552e2e..3c25c46 100644 --- a/src/kds_s2000w_config.c +++ b/src/kds_s2000w_config.c @@ -3,7 +3,7 @@ #include #include "kds_s2000w_config.h" -void _copy_config_string_to_config_value(cfg_t* cfg, const char* key, char** config_value) +void _kds_s2000w_copy_config_string_to_config_value(cfg_t* cfg, const char* key, char** config_value) { char* value_str = cfg_getstr(cfg, key); size_t str_len = strlen(value_str) + 1; @@ -11,17 +11,7 @@ void _copy_config_string_to_config_value(cfg_t* cfg, const char* key, char** con memcpy(*config_value, value_str, str_len); } -void free_config(program_config* config) -{ - free(config->scanner_url); - config->scanner_url = NULL; - free(config->username); - config->username = NULL; - free(config); - config = NULL; -} - -char* read_config_file(const char* filename) +char* kds_s2000w_config_read(const char* filename) { FILE* config_file = fopen(filename, "r"); char* buf = malloc(sizeof(char)); @@ -50,7 +40,17 @@ char* read_config_file(const char* filename) return config_string; } -program_config* load_config(char* config_string) +void kds_s2000w_config_free(program_config* config) +{ + free(config->scanner_url); + config->scanner_url = NULL; + free(config->username); + config->username = NULL; + free(config); + config = NULL; +} + +program_config* kds_s2000w_load_config(char* config_string) { program_config* config = malloc(sizeof(program_config)); config->scanner_url = malloc(sizeof(char)); @@ -77,8 +77,8 @@ program_config* load_config(char* config_string) cfg_t* cfg = cfg_init(opts, 0); cfg_parse_buf(cfg, config_string); - _copy_config_string_to_config_value(cfg, "scanner_url", &config->scanner_url); - _copy_config_string_to_config_value(cfg, "username", &config->username); + _kds_s2000w_copy_config_string_to_config_value(cfg, "scanner_url", &config->scanner_url); + _kds_s2000w_copy_config_string_to_config_value(cfg, "username", &config->username); config->log_level = cfg_getint(cfg, "default_log_level"); char log_level_str[2]; diff --git a/src/kds_s2000w_config.h b/src/kds_s2000w_config.h index 2fb229f..121101f 100644 --- a/src/kds_s2000w_config.h +++ b/src/kds_s2000w_config.h @@ -9,7 +9,8 @@ typedef struct { int ssl_verify; } program_config; -void free_config(program_config* config); -char* read_config_file(const char* filename); -program_config* load_config(char* config_stream); +char* kds_s2000w_config_read(const char* filename); + +program_config* kds_s2000w_load_config(char* config_stream); +void kds_s2000w_config_free(program_config* config); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c index 0212b7c..7b18d76 100644 --- a/tests/kds_s2000w_read_config_tests.c +++ b/tests/kds_s2000w_read_config_tests.c @@ -3,9 +3,9 @@ #include "kds_s2000w_read_config_tests.h" #include "../src/kds_s2000w_config.h" -void kds_s2000w_config_null() +void kds_s2000w_config_null_test() { - program_config* config = load_config(NULL); + program_config* config = kds_s2000w_load_config(NULL); assert_non_null(config); assert_string_equal(config->scanner_url, ""); @@ -13,13 +13,13 @@ void kds_s2000w_config_null() assert_int_equal(config->heartbeat, 1); assert_int_equal(config->ssl_verify, 0); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } -void kds_s2000w_config_read_empty_config() +void kds_s2000w_config_read_empty_config_test() { - program_config* config = load_config(""); + program_config* config = kds_s2000w_load_config(""); assert_non_null(config); assert_string_equal(config->scanner_url, ""); @@ -27,80 +27,80 @@ void kds_s2000w_config_read_empty_config() assert_int_equal(config->heartbeat, 1); assert_int_equal(config->ssl_verify, 0); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } -void kds_s2000w_config_read_parameter() +void kds_s2000w_config_read_parameter_test() { char* input_stream = " scanner_url = http://scanner.example.com \n"; - program_config* config = load_config(input_stream); + program_config* config = kds_s2000w_load_config(input_stream); assert_string_equal(config->scanner_url, "http://scanner.example.com"); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } -void kds_s2000w_config_read_parameters_without_trim() +void kds_s2000w_config_read_parameters_without_trim_test() { char* input_stream = "scanner_url=http://scanner.example.com\n"; - program_config* config = load_config(input_stream); + program_config* config = kds_s2000w_load_config(input_stream); assert_string_equal(config->scanner_url, "http://scanner.example.com"); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } -void kds_s2000w_config_multiple_parameters() +void kds_s2000w_config_multiple_parameters_test() { char* input_stream = "scanner_url=http://scanner.example.com\nusername=Mustermann\n"; - program_config* config = load_config(input_stream); + program_config* config = kds_s2000w_load_config(input_stream); assert_string_equal(config->scanner_url, "http://scanner.example.com"); assert_string_equal(config->username, "Mustermann"); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } -void kds_s200w_config_heartbeat_five_seconds() +void kds_s2000w_config_heartbeat_five_seconds_test() { char* input_stream = "heartbeat_seconds = 5\n"; - program_config* config = load_config(input_stream); + program_config* config = kds_s2000w_load_config(input_stream); assert_int_equal(config->heartbeat, 5); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } -void kds_s200w_config_default_heartbeat_zero_set_default() +void kds_s2000w_config_default_heartbeat_zero_set_default_test() { char* input_stream = "heartbeat_seconds = 0\n"; - program_config* config = load_config(input_stream); + program_config* config = kds_s2000w_load_config(input_stream); assert_int_equal(config->heartbeat, 1); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } -void kds_s200w_config_ssl_verify_on() +void kds_s2000w_config_ssl_verify_on_test() { char* input_stream = "ssl_verify = true\n"; - program_config* config = load_config(input_stream); + program_config* config = kds_s2000w_load_config(input_stream); assert_int_equal(config->ssl_verify, 1); - free_config(config); + kds_s2000w_config_free(config); config = NULL; } \ No newline at end of file diff --git a/tests/kds_s2000w_read_config_tests.h b/tests/kds_s2000w_read_config_tests.h index ac5d7f3..3e6e479 100644 --- a/tests/kds_s2000w_read_config_tests.h +++ b/tests/kds_s2000w_read_config_tests.h @@ -6,13 +6,13 @@ #include #include -void kds_s2000w_config_null(); -void kds_s2000w_config_read_parameter(); -void kds_s2000w_config_read_parameters_without_trim(); -void kds_s2000w_config_multiple_parameters(); -void kds_s2000w_config_read_empty_config(); -void kds_s200w_config_heartbeat_five_seconds(); -void kds_s200w_config_default_heartbeat_zero_set_default(); -void kds_s200w_config_ssl_verify_on(); +void kds_s2000w_config_null_test(); +void kds_s2000w_config_read_parameter_test(); +void kds_s2000w_config_read_parameters_without_trim_test(); +void kds_s2000w_config_multiple_parameters_test(); +void kds_s2000w_config_read_empty_config_test(); +void kds_s2000w_config_heartbeat_five_seconds_test(); +void kds_s2000w_config_default_heartbeat_zero_set_default_test(); +void kds_s2000w_config_ssl_verify_on_test(); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_read_config_tests_run.c b/tests/kds_s2000w_read_config_tests_run.c index 18e088d..ca76498 100644 --- a/tests/kds_s2000w_read_config_tests_run.c +++ b/tests/kds_s2000w_read_config_tests_run.c @@ -3,14 +3,14 @@ int main() { const struct CMUnitTest read_config[] = { - cmocka_unit_test(kds_s2000w_config_null), - cmocka_unit_test(kds_s2000w_config_read_empty_config), - cmocka_unit_test(kds_s2000w_config_read_parameter), - cmocka_unit_test(kds_s2000w_config_read_parameters_without_trim), - cmocka_unit_test(kds_s2000w_config_multiple_parameters), - cmocka_unit_test(kds_s200w_config_heartbeat_five_seconds), - cmocka_unit_test(kds_s200w_config_default_heartbeat_zero_set_default), - cmocka_unit_test(kds_s200w_config_ssl_verify_on) + cmocka_unit_test(kds_s2000w_config_null_test), + cmocka_unit_test(kds_s2000w_config_read_empty_config_test), + cmocka_unit_test(kds_s2000w_config_read_parameter_test), + cmocka_unit_test(kds_s2000w_config_read_parameters_without_trim_test), + cmocka_unit_test(kds_s2000w_config_multiple_parameters_test), + cmocka_unit_test(kds_s2000w_config_heartbeat_five_seconds_test), + cmocka_unit_test(kds_s2000w_config_default_heartbeat_zero_set_default_test), + cmocka_unit_test(kds_s2000w_config_ssl_verify_on_test) }; return cmocka_run_group_tests(read_config, NULL, NULL); -- 2.39.5