From 5e3ad463273680a3ed760a52219053207669cb62 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Fri, 14 Feb 2025 11:42:51 +0100 Subject: [PATCH] remove not needed response --- src/kds_s2000w_client.c | 19 +++---------------- src/kds_s2000w_client.h | 6 +++--- src/kds_s2000w_handler.c | 18 +++--------------- tests/kds_s2000w_client_mock.c | 9 +++------ tests/kds_s2000w_client_mock.h | 6 +++--- tests/kds_s2000w_net_tests.c | 13 ------------- 6 files changed, 15 insertions(+), 56 deletions(-) diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index 3ff17a5..7f951b7 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -318,7 +318,7 @@ uint8_t kds_s2000w_client_status_session(int64_t sessionid, response* resp) return result; } -uint8_t kds_s2000w_client_start_scan(int64_t sessionid, response* resp) +uint8_t kds_s2000w_client_start_scan(int64_t sessionid) { kds_s2000w_debug_printf(ALL, "kds_s2000w_client_start_scan"); @@ -345,11 +345,7 @@ uint8_t kds_s2000w_client_start_scan(int64_t sessionid, response* resp) _kds_s2000w_client_set_ssl_verification_off(curl); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _kds_s2000w_client_write_callback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, resp); CURLcode result = curl_easy_perform(curl); - _kds_s2000w_client_add_null_terminate_to_response(resp); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); _kds_s2000w_client_print_error_status(curl); _kds_s2000w_client_print_error_result(result); @@ -366,7 +362,7 @@ uint8_t kds_s2000w_client_start_scan(int64_t sessionid, response* resp) return result; } -uint8_t kds_s2000w_client_stop_scan(int64_t sessionid, response* resp) +uint8_t kds_s2000w_client_stop_scan(int64_t sessionid) { kds_s2000w_debug_printf(ALL, "kds_s2000w_client_stop_scan"); @@ -393,11 +389,7 @@ uint8_t kds_s2000w_client_stop_scan(int64_t sessionid, response* resp) _kds_s2000w_client_set_ssl_verification_off(curl); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _kds_s2000w_client_write_callback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, resp); CURLcode result = curl_easy_perform(curl); - _kds_s2000w_client_add_null_terminate_to_response(resp); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); _kds_s2000w_client_print_error_status(curl); _kds_s2000w_client_print_error_result(result); @@ -446,7 +438,6 @@ uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, respo curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _kds_s2000w_client_write_callback); curl_easy_setopt(curl, CURLOPT_WRITEDATA, resp); CURLcode result = curl_easy_perform(curl); - _kds_s2000w_client_add_null_terminate_to_response(resp); curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); _kds_s2000w_client_print_error_status(curl); @@ -466,7 +457,7 @@ uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, respo return result; } -uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number, response* resp) +uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number) { kds_s2000w_debug_printf(ALL, "kds_s2000w_client_delete_image"); @@ -495,11 +486,7 @@ uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number, re _kds_s2000w_client_set_ssl_verification_off(curl); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _kds_s2000w_client_write_callback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, resp); CURLcode result = curl_easy_perform(curl); - _kds_s2000w_client_add_null_terminate_to_response(resp); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); _kds_s2000w_client_print_error_status(curl); _kds_s2000w_client_print_error_result(result); diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h index 31709a5..29e6432 100644 --- a/src/kds_s2000w_client.h +++ b/src/kds_s2000w_client.h @@ -21,11 +21,11 @@ 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_start_scan(int64_t sessionid, response* resp); -uint8_t kds_s2000w_client_stop_scan(int64_t sessionid, response* 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_delete_image(int64_t sessionid, uint8_t img_number, response* 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); diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 46500c8..a367b15 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -217,22 +217,14 @@ void kds_s2000w_handler_start_scan(handler* h) { kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_start_scan"); - response* resp = kds_s2000w_client_response_init(); - kds_s2000w_client_start_scan(h->sessionid, resp); - - kds_s2000w_client_response_free(resp); - resp = NULL; + kds_s2000w_client_start_scan(h->sessionid); } void kds_s2000w_handler_stop_scan(handler* h) { kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_stop_scan"); - response* resp = kds_s2000w_client_response_init(); - kds_s2000w_client_stop_scan(h->sessionid, resp); - - kds_s2000w_client_response_free(resp); - resp = NULL; + kds_s2000w_client_stop_scan(h->sessionid); } void kds_s2000w_handler_get_current_metadata(handler* h, metadata* params) @@ -355,10 +347,6 @@ void kds_s2000w_handler_delete_current_image(handler* h) { kds_s2000w_debug_printf(ALL, "delete_current_image"); - response* resp = kds_s2000w_client_response_init(); - kds_s2000w_client_delete_image(h->sessionid, h->current_scan_status->current_image_number, resp); + kds_s2000w_client_delete_image(h->sessionid, h->current_scan_status->current_image_number); h->current_scan_status->available_images--; - - kds_s2000w_client_response_free(resp); - resp = NULL; } \ No newline at end of file diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c index 5ea81aa..a58f26c 100644 --- a/tests/kds_s2000w_client_mock.c +++ b/tests/kds_s2000w_client_mock.c @@ -40,17 +40,15 @@ void __wrap_kds_s2000w_client_close_session(int64_t sessionid) return; } -uint8_t __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response) +uint8_t __wrap_kds_s2000w_client_start_scan(int64_t sessionid) { function_called(); - mock_response(response); return mock_type(int); } -uint8_t __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response) +uint8_t __wrap_kds_s2000w_client_stop_scan(int64_t sessionid) { function_called(); - mock_response(response); return mock_type(int); } @@ -68,10 +66,9 @@ uint8_t __wrap_kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number return mock_type(int); } -uint8_t __wrap_kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number, response* response) +uint8_t __wrap_kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number) { function_called(); - mock_response(response); return mock_type(int); } diff --git a/tests/kds_s2000w_client_mock.h b/tests/kds_s2000w_client_mock.h index ec63ea2..3aa7623 100644 --- a/tests/kds_s2000w_client_mock.h +++ b/tests/kds_s2000w_client_mock.h @@ -16,12 +16,12 @@ void __wrap_kds_s2000w_client_free(); uint8_t __wrap_kds_s2000w_client_open_session(response* response); void __wrap_kds_s2000w_client_close_session(int64_t sessionid); -uint8_t __wrap_kds_s2000w_client_start_scan(int64_t sessionid, response* response); -uint8_t __wrap_kds_s2000w_client_stop_scan(int64_t sessionid, response* response); +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_delete_image(int64_t sessionid, uint8_t img_number, response* 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); diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index 607e883..4e06e3e 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -207,7 +207,6 @@ void sane_kds_s2000w_net_open_not_connected_test() void sane_kds_s2000w_net_start_test(void** state) { response** response_list = (response**) *state; - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_start_scan, 0); response* resp_status = kds_s2000w_client_response_init(); const char* status = "{ \ @@ -228,7 +227,6 @@ void sane_kds_s2000w_net_start_test(void** state) will_return(__wrap_kds_s2000w_client_status_session, 0); will_return(mock_response, response_list[2]); will_return(__wrap_kds_s2000w_client_get_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_delete_image, 0); expect_function_call(__wrap_kds_s2000w_client_start_scan); expect_function_call(__wrap_kds_s2000w_client_status_session); @@ -254,7 +252,6 @@ 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; - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_start_scan, 0); response* resp_status = kds_s2000w_client_response_init(); const char* status = "{ \ @@ -275,7 +272,6 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state) will_return(__wrap_kds_s2000w_client_status_session, 0); will_return(mock_response, response_list[2]); will_return(__wrap_kds_s2000w_client_get_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_delete_image, 0); expect_function_call(__wrap_kds_s2000w_client_start_scan); expect_function_call(__wrap_kds_s2000w_client_status_session); @@ -302,7 +298,6 @@ 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; - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_start_scan, 0); response* resp_status = kds_s2000w_client_response_init(); const char* status = "{ \ @@ -323,9 +318,7 @@ void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state) will_return(__wrap_kds_s2000w_client_status_session, 0); will_return(mock_response, response_list[2]); will_return(__wrap_kds_s2000w_client_get_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_delete_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_stop_scan, 0); expect_function_call(__wrap_kds_s2000w_client_start_scan); expect_function_call(__wrap_kds_s2000w_client_status_session); @@ -352,7 +345,6 @@ 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; - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_start_scan, 0); response* resp_status = kds_s2000w_client_response_init(); const char* status = "{ \ @@ -373,9 +365,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state) will_return(__wrap_kds_s2000w_client_status_session, 0); will_return(mock_response, response_list[2]); will_return(__wrap_kds_s2000w_client_get_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_delete_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_stop_scan, 0); expect_function_call(__wrap_kds_s2000w_client_start_scan); expect_function_call(__wrap_kds_s2000w_client_status_session); @@ -409,9 +399,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state) will_return(__wrap_kds_s2000w_client_status_session, 0); will_return(mock_response, response_list[2]); will_return(__wrap_kds_s2000w_client_get_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_delete_image, 0); - will_return(mock_response, response_list[0]); will_return(__wrap_kds_s2000w_client_stop_scan, 0); expect_function_call(__wrap_kds_s2000w_client_status_session); expect_function_call(__wrap_kds_s2000w_client_get_image); @@ -452,7 +440,6 @@ void sane_kds_s2000w_net_cancel_test() response* resp = kds_s2000w_client_response_init(); resp->code = 200; resp->size = 0; - will_return(mock_response, resp); will_return(__wrap_kds_s2000w_client_stop_scan, 0); expect_function_call(__wrap_kds_s2000w_client_status_session); expect_function_call(__wrap_kds_s2000w_client_stop_scan); -- 2.39.5