change rename response type

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index 6d5283364eda7a94ffbc9c2995a7f96541c75b38..323fee52f0a06756d352dd87defa03369faac059 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -57,7 +57,7 @@ void _kds_s2000w_client_set_verbose(CURL* curl)
 
 size_t _kds_s2000w_client_write_callback(const char* ptr, size_t size, size_t nmemb, void* data)
 {
-       response* resp = (response*) data;
+       response_t* resp = (response_t*) data;
 
        char* tmp_resp = realloc(resp->data, resp->size + size * nmemb);
        if (tmp_resp == NULL) {
@@ -74,7 +74,7 @@ size_t _kds_s2000w_client_write_callback(const char* ptr, size_t size, size_t nm
        return size * nmemb;
 }
 
-void _kds_s2000w_client_add_null_terminate_to_response(response* resp)
+void _kds_s2000w_client_add_null_terminate_to_response(response_t* resp)
 {
        resp->size++;
        char* tmp_resp = realloc(resp->data, resp->size);
@@ -260,11 +260,11 @@ void kds_s2000w_client_free()
        curl_global_cleanup();
 }
 
-response* kds_s2000w_client_response_init()
+response_t* kds_s2000w_client_response_init()
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_response_init");
 
-       response* resp = malloc(sizeof(response));
+       response_t* resp = malloc(sizeof(response_t));
        if (resp == NULL)
                return NULL;
 
@@ -275,7 +275,7 @@ response* kds_s2000w_client_response_init()
        return resp;
 }
 
-void kds_s2000w_client_response_free(response* resp)
+void kds_s2000w_client_response_free(response_t* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_response_free");
 
@@ -287,7 +287,7 @@ void kds_s2000w_client_response_free(response* resp)
        free(resp);
 }
 
-uint8_t kds_s2000w_client_open_session(response* resp)
+uint8_t kds_s2000w_client_open_session(response_t* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_open_session");
 
@@ -345,7 +345,7 @@ void kds_s2000w_client_close_session(int64_t sessionid)
        param = NULL;
 }
 
-uint8_t kds_s2000w_client_get_capabilities(response* resp)
+uint8_t kds_s2000w_client_get_capabilities(response_t* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_get_capabilities");
 
@@ -373,7 +373,7 @@ uint8_t kds_s2000w_client_get_capabilities(response* resp)
        return result;
 }
 
-uint8_t kds_s2000w_client_status_session(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_status_session(int64_t sessionid, response_t* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_status_session");
 
@@ -453,7 +453,7 @@ uint8_t kds_s2000w_client_stop_scan(int64_t sessionid)
        return result;
 }
 
-uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* resp)
+uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response_t* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_get_image");
 
@@ -509,7 +509,7 @@ uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number)
        return result;
 }
 
-uint8_t kds_s2000w_client_get_option(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_get_option(int64_t sessionid, response_t* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_get_option");
 
@@ -536,7 +536,7 @@ uint8_t kds_s2000w_client_get_option(int64_t sessionid, response* resp)
        return result;
 }
 
-uint8_t kds_s2000w_client_set_option(int64_t sessionid, response* resp)
+uint8_t kds_s2000w_client_set_option(int64_t sessionid, response_t* resp)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_set_option");
 

diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h
index f3d94876ecb570ae89bc46b72d160795cca5f679..aefb1c5c0bdd5aaac15031e648c544f8f5a94d2f 100644 (file)
--- a/src/kds_s2000w_client.h
+++ b/src/kds_s2000w_client.h
@@ -8,7 +8,7 @@ typedef struct {
        char* data;
        size_t size;
        uint64_t code;
-} response;
+} response_t;
 
 typedef struct {
        char* scanner_url;
@@ -20,22 +20,22 @@ typedef struct {
 void kds_s2000w_client_init(const client_config_t* config);
 void kds_s2000w_client_free();
 
-response* kds_s2000w_client_response_init();
-void kds_s2000w_client_response_free(response* resp);
+response_t* kds_s2000w_client_response_init();
+void kds_s2000w_client_response_free(response_t* resp);
 
-uint8_t kds_s2000w_client_open_session(response* resp);
+uint8_t kds_s2000w_client_open_session(response_t* resp);
 void kds_s2000w_client_close_session(int64_t sessionid);
 
-uint8_t kds_s2000w_client_get_capabilities(response* resp);
-uint8_t kds_s2000w_client_status_session(int64_t sessionid, response* resp);
+uint8_t kds_s2000w_client_get_capabilities(response_t* resp);
+uint8_t kds_s2000w_client_status_session(int64_t sessionid, response_t* resp);
 
 uint8_t kds_s2000w_client_start_scan(int64_t sessionid);
 uint8_t kds_s2000w_client_stop_scan(int64_t sessionid);
 
-uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* resp);
+uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response_t* resp);
 uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number);
 
-uint8_t kds_s2000w_client_get_option(int64_t sessionid, response* resp);
-uint8_t kds_s2000w_client_set_option(int64_t sessionid, response* resp);
+uint8_t kds_s2000w_client_get_option(int64_t sessionid, response_t* resp);
+uint8_t kds_s2000w_client_set_option(int64_t sessionid, response_t* resp);
 
 #endif
\ No newline at end of file

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index b69d3e407a6a2e6cd14571f4a6dfc8d5484b187d..edd5c20f7c2b214390cee72433f03353cc201fb3 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -175,7 +175,7 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
        kds_s2000w_debug_printf_version(INFO, DEVICE_NAME, MAJOR, MINOR, PATCH);
 
        /* status code 408 request timeout waking up repeat open session */
-       response* resp = NULL;
+       response_t* resp = NULL;
        uint8_t result = 0;
        for (uint32_t i = 0; i < ATTEMPT; i++) {
                kds_s2000w_client_response_free(resp);
@@ -240,7 +240,7 @@ void kds_s2000w_handler_recreate_session(handler* h)
 {
        kds_s2000w_client_close_session(h->sessionid);
 
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        kds_s2000w_client_open_session(resp);
 
        if (resp->code != 200) {
@@ -364,7 +364,7 @@ void kds_s2000w_handler_get_current_scan_status(handler* h)
        if (h->scan_status->available_images > 1)
                return;
 
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        kds_s2000w_client_status_session(h->sessionid, resp);
        kds_s2000w_debug_printf(DEBUG, resp->data);
 
@@ -393,7 +393,7 @@ void kds_s2000w_handler_download_current_image(handler* h)
        h->image->data = NULL;
        h->image->size = 0;
 
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        kds_s2000w_client_get_image(h->sessionid, h->scan_status->image_number, resp);
        h->image->size = resp->size;
        h->image->data = malloc(sizeof(char) * resp->size);

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 894df4edb8be2e08528c8848128ddacc90c5c48e..792d8449df9a9fa5bc9bbe2937ac2d4aea1e88ec 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -43,7 +43,7 @@ void _kds_s2000w_handler_opts_load_options(handler* h)
        json_object_put(h->scanner_config);
        h->scanner_config = NULL;
 
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        uint8_t result = kds_s2000w_client_get_option(h->sessionid, resp);
 
        if (result != 0 || resp->code != 200) {
@@ -68,7 +68,7 @@ void _kds_s2000w_handler_opts_set_autostart_on(json_object* config)
 
 void _kds_s2000w_handler_opts_set_option_to_default(handler* h)
 {
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        kds_s2000w_client_get_capabilities(resp);
        json_object* capabilities = json_tokener_parse(resp->data);
        json_object* default_values = json_object_object_get(capabilities, "Defaults");
@@ -99,7 +99,7 @@ json_object* _kds_s2000w_handler_opts_reset(const option_descriptor* descriptor,
 void _kds_s2000w_handler_opts_set_options(handler* h)
 {
        const char* json_string = json_object_to_json_string_ext(h->scanner_config, JSON_C_TO_STRING_PLAIN);
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        resp->size = sizeof(char) * strlen(json_string);
        resp->code = 0;
        resp->data = realloc(resp->data, resp->size);

diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c
index d9228524a2117a7b2dcd21e9c2e74486172856d1..aef762698438afc594f94b46b80032f5c7b1bcf9 100644 (file)
--- a/tests/kds_s2000w_client_mock.c
+++ b/tests/kds_s2000w_client_mock.c
@@ -4,9 +4,9 @@
 #include <unistd.h>
 #include "kds_s2000w_client_mock.h"
 
-void mock_response(response* resp)
+void mock_response(response_t* resp)
 {
-       const response* mock_resp = mock_type(response*);
+       const response_t* mock_resp = mock_type(response_t*);
        if (mock_resp == NULL)
                return;
 
@@ -28,7 +28,7 @@ void __wrap_kds_s2000w_client_free()
        return;
 }
 
-uint8_t __wrap_kds_s2000w_client_open_session(response* response)
+uint8_t __wrap_kds_s2000w_client_open_session(response_t* response)
 {
        function_called();
        mock_response(response);
@@ -53,14 +53,14 @@ uint8_t __wrap_kds_s2000w_client_stop_scan(int64_t sessionid)
        return mock_type(int);
 }
 
-uint8_t __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_status_session(int64_t sessionid, response_t* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-uint8_t __wrap_kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* response)
+uint8_t __wrap_kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response_t* response)
 {
        function_called();
        mock_response(response);
@@ -73,14 +73,14 @@ uint8_t __wrap_kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_num
        return mock_type(int);
 }
 
-uint8_t __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_get_option(int64_t sessionid, response_t* response)
 {
        function_called();
        mock_response(response);
        return mock_type(int);
 }
 
-uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response)
+uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response_t* response)
 {
        function_called();
        mock_response(response);

diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h
index 7103ebda43892a70c23d8aa8477c1a091872d12e..8f7ea0483a2eb34f86eaa8c499a201488e46d740 100644 (file)
--- a/tests/kds_s2000w_client_mock.h
+++ b/tests/kds_s2000w_client_mock.h
@@ -8,23 +8,23 @@
 #include "../src/kds_s2000w_client.h"
 #include "../src/kds_s2000w_image_converter.h"
 
-void mock_response(response* resp);
+void mock_response(response_t* resp);
 
 void __wrap_kds_s2000w_client_init(const char* scanner_url, const char* username, bool ssl_verify, uint8_t heartbeat);
 void __wrap_kds_s2000w_client_free();
 
-uint8_t __wrap_kds_s2000w_client_open_session(response* response);
+uint8_t __wrap_kds_s2000w_client_open_session(response_t* response);
 void __wrap_kds_s2000w_client_close_session(int64_t sessionid);
 
 uint8_t __wrap_kds_s2000w_client_start_scan(int64_t sessionid);
 uint8_t __wrap_kds_s2000w_client_stop_scan(int64_t sessionid);
 
-uint8_t __wrap_kds_s2000w_client_status_session(int64_t sessionid, response* response);
-uint8_t __wrap_kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response* response);
+uint8_t __wrap_kds_s2000w_client_status_session(int64_t sessionid, response_t* response);
+uint8_t __wrap_kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, response_t* response);
 uint8_t __wrap_kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number);
 
-uint8_t __wrap_kds_s2000w_client_get_option(int64_t sessionid, response* response);
-uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response* response);
+uint8_t __wrap_kds_s2000w_client_get_option(int64_t sessionid, response_t* response);
+uint8_t __wrap_kds_s2000w_client_set_option(int64_t sessionid, response_t* response);
 
 void __wrap_kds_s2000w_convert_jpg_to_pnm_with_depth(blobdata* in, blobdata* out);
 void __wrap_kds_s2000w_convert_tiff_to_pnm(blobdata* in, blobdata* out);

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 97126425097ad4f1f25b612ce5069103226d3348..f1a4cd8dd0f9a6795f3be075fa7d200b7087a0d3 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -19,7 +19,7 @@
 int setup_default_get_option(void** state)
 {
        kds_s2000w_option_descriptors_init(PROFILE_FULL);
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        const char* responsedata = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 0, \
@@ -86,7 +86,7 @@ int setup_default_get_option(void** state)
 int teardown_default_get_option(void** state)
 {
        kds_s2000w_option_descriptors_free();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        kds_s2000w_client_response_free(resp);
        resp = NULL;
        return 0;
@@ -94,7 +94,7 @@ int teardown_default_get_option(void** state)
 
 void sane_kds_s2000w_net_control_get_option_zero_test(void** state)
 {
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_get_option, 0);
        will_return(mock_response, resp);
@@ -115,7 +115,7 @@ void sane_kds_s2000w_net_control_get_option_zero_test(void** state)
 void sane_kds_s2000w_net_control_get_option_two_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -130,7 +130,7 @@ void sane_kds_s2000w_net_control_get_option_two_test(void** state)
 void sane_kds_s2000w_net_control_get_option_three_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -145,7 +145,7 @@ void sane_kds_s2000w_net_control_get_option_three_test(void** state)
 void sane_kds_s2000w_net_control_get_option_four_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = 0;
 
@@ -160,7 +160,7 @@ void sane_kds_s2000w_net_control_get_option_four_test(void** state)
 void sane_kds_s2000w_net_control_get_option_five_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -175,7 +175,7 @@ void sane_kds_s2000w_net_control_get_option_five_test(void** state)
 void sane_kds_s2000w_net_control_get_option_seven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -190,7 +190,7 @@ void sane_kds_s2000w_net_control_get_option_seven_test(void** state)
 void sane_kds_s2000w_net_control_get_option_eight_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -205,7 +205,7 @@ void sane_kds_s2000w_net_control_get_option_eight_test(void** state)
 void sane_kds_s2000w_net_control_get_option_nine_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -220,7 +220,7 @@ void sane_kds_s2000w_net_control_get_option_nine_test(void** state)
 void sane_kds_s2000w_net_control_get_option_ten_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -235,7 +235,7 @@ void sane_kds_s2000w_net_control_get_option_ten_test(void** state)
 void sane_kds_s2000w_net_control_get_option_eleven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -250,7 +250,7 @@ void sane_kds_s2000w_net_control_get_option_eleven_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twelve_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -265,7 +265,7 @@ void sane_kds_s2000w_net_control_get_option_twelve_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -280,7 +280,7 @@ void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -295,7 +295,7 @@ void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state)
 void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -310,7 +310,7 @@ void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state)
 void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -325,7 +325,7 @@ void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state)
 void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -340,7 +340,7 @@ void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twenty_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -355,7 +355,7 @@ void sane_kds_s2000w_net_control_get_option_twenty_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -370,7 +370,7 @@ void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentytwo_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -385,7 +385,7 @@ void sane_kds_s2000w_net_control_get_option_twentytwo_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -400,7 +400,7 @@ void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -415,7 +415,7 @@ void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -430,7 +430,7 @@ void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentysix_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -445,7 +445,7 @@ void sane_kds_s2000w_net_control_get_option_twentysix_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -460,7 +460,7 @@ void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -475,7 +475,7 @@ void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state)
 void sane_kds_s2000w_net_control_get_option_twentynine_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -490,7 +490,7 @@ void sane_kds_s2000w_net_control_get_option_twentynine_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdy_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -505,7 +505,7 @@ void sane_kds_s2000w_net_control_get_option_thirdy_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdythree_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
@@ -520,7 +520,7 @@ void sane_kds_s2000w_net_control_get_option_thirdythree_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -535,7 +535,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdyfive_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -550,7 +550,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyfive_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdysix_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -565,7 +565,7 @@ void sane_kds_s2000w_net_control_get_option_thirdysix_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -580,7 +580,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -595,7 +595,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state)
 void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -610,7 +610,7 @@ void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = 0;
 
@@ -625,7 +625,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -640,7 +640,7 @@ void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -655,7 +655,7 @@ void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -670,7 +670,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourtyfive_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
@@ -685,7 +685,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyfive_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourtysix_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
@@ -700,7 +700,7 @@ void sane_kds_s2000w_net_control_get_option_fourtysix_test(void** state)
 void sane_kds_s2000w_net_control_get_option_fourtyseven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
-       response* resp = (response*) *state;
+       response_t* resp = (response_t*) *state;
        h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 77eca03b9a87a08527a8c11ecb676666ee13b0d6..901393566caa50045ac4b9ae294a68f642f7457a 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -17,7 +17,7 @@
 
 int setup(void** state)
 {
-       response** response_list = malloc(sizeof(response*) * 4);
+       response_t** response_list = malloc(sizeof(response_t*) * 4);
        if (response_list == NULL)
                return 1;
        response_list[0] = kds_s2000w_client_response_init();
@@ -71,7 +71,7 @@ int setup(void** state)
 
 int teardown(void** state)
 {
-       response** respons_list = (response**) *state;
+       response_t** respons_list = (response_t**) *state;
        for (uint32_t i = 0; respons_list[i] != NULL; i++) {
                kds_s2000w_client_response_free(respons_list[i]);
                respons_list[i] = NULL;
@@ -240,7 +240,7 @@ void sane_kds_s2000w_net_get_parameter_bw_test()
 
 void sane_kds_s2000w_net_open_test()
 {
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        if (resp == NULL)
                return;
        const char* responsedata = "{\"SessionId\":\"1251877821\"}";
@@ -275,7 +275,7 @@ void sane_kds_s2000w_net_open_test()
 
 void sane_kds_s2000w_net_open_busy_device_test()
 {
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        resp->code = 423;
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
@@ -306,7 +306,7 @@ void sane_kds_s2000w_net_open_invalid_test()
 
 void sane_kds_s2000w_net_open_not_connected_test()
 {
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        resp->code = 0;
        will_return(mock_response, resp);
        will_return(__wrap_kds_s2000w_client_open_session, 1);
@@ -325,9 +325,9 @@ void sane_kds_s2000w_net_open_not_connected_test()
 
 void sane_kds_s2000w_net_start_test(void** state)
 {
-       response** response_list = (response**) *state;
+       response_t** response_list = (response_t**) *state;
        will_return(__wrap_kds_s2000w_client_start_scan, 0);
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 2, \
@@ -370,9 +370,9 @@ void sane_kds_s2000w_net_start_test(void** state)
 
 void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state)
 {
-       response** response_list = (response**) *state;
+       response_t** response_list = (response_t**) *state;
        will_return(__wrap_kds_s2000w_client_start_scan, 0);
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 1, \
@@ -415,9 +415,9 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state)
 
 void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state)
 {
-       response** response_list = (response**) *state;
+       response_t** response_list = (response_t**) *state;
        will_return(__wrap_kds_s2000w_client_start_scan, 0);
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 1, \
@@ -462,9 +462,9 @@ void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state)
 
 void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
 {
-       response** response_list = (response**) *state;
+       response_t** response_list = (response_t**) *state;
        will_return(__wrap_kds_s2000w_client_start_scan, 0);
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 2, \
@@ -538,7 +538,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
 
 void sane_kds_s2000w_net_cancel_test()
 {
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 2, \
@@ -555,7 +555,7 @@ void sane_kds_s2000w_net_cancel_test()
        resp_status->code = 200;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
-       response* resp = kds_s2000w_client_response_init();
+       response_t* resp = kds_s2000w_client_response_init();
        resp->code = 200;
        resp->size = 0;
        will_return(__wrap_kds_s2000w_client_stop_scan, 0);
@@ -591,7 +591,7 @@ void sane_kds_s2000w_net_cancel_start_test()
 
 void sane_kds_s2000w_net_cancel_canceled_test()
 {
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{\"SessionId\":\"1251877821\"}";
        resp_status->size = 27;
        resp_status->data = malloc(resp_status->size);
@@ -599,7 +599,7 @@ void sane_kds_s2000w_net_cancel_canceled_test()
        resp_status->code = 200;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
-       response* set_option = kds_s2000w_client_response_init();
+       response_t* set_option = kds_s2000w_client_response_init();
        set_option->code = 200;
        set_option->size = 0;
        will_return(mock_response, set_option);
@@ -624,7 +624,7 @@ void sane_kds_s2000w_net_cancel_canceled_test()
 
 void sane_kds_s2000w_net_cancel_completed_scan_feeder_test()
 {
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 2, \
@@ -657,7 +657,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder_test()
 
 void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
 {
-       response* resp_status = kds_s2000w_client_response_init();
+       response_t* resp_status = kds_s2000w_client_response_init();
        const char* status = "{ \
                \"Status\": { \
                        \"NumImagesScanned\": 2, \
@@ -674,7 +674,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
        resp_status->code = 200;
        will_return(mock_response, resp_status);
        will_return(__wrap_kds_s2000w_client_status_session, 0);
-       response* resp_session = kds_s2000w_client_response_init();
+       response_t* resp_session = kds_s2000w_client_response_init();
        const char* responsedata = "{\"SessionId\":\"1251877821\"}";
        resp_session->size = 27;
        resp_session->data = malloc(resp_session->size);
@@ -682,7 +682,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
        resp_session->code = 200;
        will_return(mock_response, resp_session);
        will_return(__wrap_kds_s2000w_client_open_session, 0);
-       response* resp_options = kds_s2000w_client_response_init();
+       response_t* resp_options = kds_s2000w_client_response_init();
        resp_options->code = 200;
        resp_options->size = 0;
        will_return(mock_response, resp_options);