change rename program config

diff --git a/src/kds_s2000w_config.c b/src/kds_s2000w_config.c
index 9042ba3f56a3abc48a667c941449df4b676746ba..d2a25ac27f433b7cb4318dd8c598c22077503dfd 100644 (file)
--- a/src/kds_s2000w_config.c
+++ b/src/kds_s2000w_config.c
@@ -10,9 +10,9 @@
 #define SSL_VERIFY "ssl_verify"
 #define PROFILE "profile"
 
-program_config* _kds_s2000w_config_init()
+program_config_t* _kds_s2000w_config_init()
 {
-       program_config* config = malloc(sizeof(program_config));
+       program_config_t* config = malloc(sizeof(program_config_t));
        if (config == NULL)
                return NULL;
 
@@ -65,9 +65,9 @@ char* kds_s2000w_config_read(const char* filename)
        return config_string;
 }
 
-program_config* kds_s2000w_config_load(char* config_string)
+program_config_t* kds_s2000w_config_load(char* config_string)
 {
-       program_config* config = _kds_s2000w_config_init();
+       program_config_t* config = _kds_s2000w_config_init();
        if (config == NULL)
                return NULL;
 
@@ -112,7 +112,7 @@ program_config* kds_s2000w_config_load(char* config_string)
        return config;
 }
 
-void kds_s2000w_config_free(program_config* config)
+void kds_s2000w_config_free(program_config_t* config)
 {
        free(config->scanner_url);
        config->scanner_url = NULL;

diff --git a/src/kds_s2000w_config.h b/src/kds_s2000w_config.h
index ff11989f4babf7748ecbb4c0c861bc8361f3c454..b9e29fbd040e6ed1135931b17282002c4b47bc3a 100644 (file)
--- a/src/kds_s2000w_config.h
+++ b/src/kds_s2000w_config.h
@@ -6,15 +6,15 @@
 typedef struct {
        char* scanner_url;
        char* username;
+       uint8_t profile;
        uint8_t log_level;
        uint8_t heartbeat;
        bool ssl_verify;
-       uint8_t profile;
-} program_config;
+} program_config_t;
 
 char* kds_s2000w_config_read(const char* filename);
 
-program_config* kds_s2000w_config_load(char* config_stream);
-void kds_s2000w_config_free(program_config* config);
+program_config_t* kds_s2000w_config_load(char* config_stream);
+void kds_s2000w_config_free(program_config_t* config);
 
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index edd5c20f7c2b214390cee72433f03353cc201fb3..418a2b8b93b6e623d5e2e7b5a8cb1deb89de3faa 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -37,7 +37,7 @@ uint32_t _kds_s2000w_handler_find_first_data_byte(const imagedata_t* image)
        return byte_count;
 }
 
-client_config_t* _kds_s2000w_handler_convert_config(program_config* config)
+client_config_t* _kds_s2000w_handler_convert_config(program_config_t* config)
 {
        client_config_t* client_config = malloc(sizeof(client_config_t));
        if (client_config == NULL)
@@ -59,7 +59,7 @@ void _kds_s2000w_handler_load_config(handler* h)
        if (config_stream == NULL)
                return;
 
-       program_config* config = kds_s2000w_config_load(config_stream);
+       program_config_t* config = kds_s2000w_config_load(config_stream);
        if (config == NULL)
                return;
 

diff --git a/tests/kds_s2000w_read_config_tests.c b/tests/kds_s2000w_read_config_tests.c
index 9dc9f15a145ba2d4064e117c6b8e48989e514993..9eaf99e847661f84f26598fae2deadf6a580cd21 100644 (file)
--- a/tests/kds_s2000w_read_config_tests.c
+++ b/tests/kds_s2000w_read_config_tests.c
@@ -9,7 +9,7 @@
 
 void kds_s2000w_config_null_test()
 {
-       program_config* config = kds_s2000w_config_load(NULL);
+       program_config_t* config = kds_s2000w_config_load(NULL);
 
        assert_non_null(config);
        assert_string_equal(config->scanner_url, "");
@@ -23,7 +23,7 @@ void kds_s2000w_config_null_test()
 
 void kds_s2000w_config_read_empty_config_test()
 {
-       program_config* config = kds_s2000w_config_load("");
+       program_config_t* config = kds_s2000w_config_load("");
 
        assert_non_null(config);
        assert_string_equal(config->scanner_url, "");
@@ -39,7 +39,7 @@ void kds_s2000w_config_read_parameter_test()
 {
        char* input_stream = "   scanner_url   =   http://scanner.example.com    \n";
 
-       program_config* config = kds_s2000w_config_load(input_stream);
+       program_config_t* config = kds_s2000w_config_load(input_stream);
 
        assert_string_equal(config->scanner_url, "http://scanner.example.com");
 
@@ -51,7 +51,7 @@ void kds_s2000w_config_read_parameters_without_trim_test()
 {
        char* input_stream = "scanner_url=http://scanner.example.com\n";
 
-       program_config* config = kds_s2000w_config_load(input_stream);
+       program_config_t* config = kds_s2000w_config_load(input_stream);
 
        assert_string_equal(config->scanner_url, "http://scanner.example.com");
 
@@ -63,7 +63,7 @@ void kds_s2000w_config_multiple_parameters_test()
 {
        char* input_stream = "scanner_url=http://scanner.example.com\nusername=Mustermann\n";
 
-       program_config* config = kds_s2000w_config_load(input_stream);
+       program_config_t* config = kds_s2000w_config_load(input_stream);
 
        assert_string_equal(config->scanner_url, "http://scanner.example.com");
        assert_string_equal(config->username, "Mustermann");
@@ -76,7 +76,7 @@ void kds_s2000w_config_heartbeat_five_seconds_test()
 {
        char* input_stream = "heartbeat_seconds = 5\n";
 
-       program_config* config = kds_s2000w_config_load(input_stream);
+       program_config_t* config = kds_s2000w_config_load(input_stream);
 
        assert_int_equal(config->heartbeat, 5);
 
@@ -88,7 +88,7 @@ void kds_s2000w_config_default_heartbeat_zero_set_default_test()
 {
        char* input_stream = "heartbeat_seconds = 0\n";
 
-       program_config* config = kds_s2000w_config_load(input_stream);
+       program_config_t* config = kds_s2000w_config_load(input_stream);
 
        assert_int_equal(config->heartbeat, 1);
 
@@ -100,7 +100,7 @@ void kds_s2000w_config_ssl_verify_on_test()
 {
        char* input_stream = "ssl_verify = true\n";
 
-       program_config* config = kds_s2000w_config_load(input_stream);
+       program_config_t* config = kds_s2000w_config_load(input_stream);
 
        assert_true(config->ssl_verify);
 
@@ -112,7 +112,7 @@ void kds_s2000w_config_profile_test()
 {
        char* input_stream = "profile = 1\n";
 
-       program_config* config = kds_s2000w_config_load(input_stream);
+       program_config_t* config = kds_s2000w_config_load(input_stream);
 
        assert_int_equal(config->profile, 1);