From 103a3033b0d2898f51444f79eb2c2120877d98cc Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Wed, 1 May 2024 14:28:47 +0200 Subject: [PATCH] remove client get metadata --- CMakeLists.txt | 1 - src/kds_s2000w_client.c | 48 ---------------------------------- src/kds_s2000w_client.h | 1 - tests/kds_s2000w_client_mock.c | 7 ----- 4 files changed, 57 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b463696..9d19da8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,6 @@ IF (RUN_TESTS) --wrap,kds_s2000w_client_close_session,\ --wrap,kds_s2000w_client_status_session,\ --wrap,kds_s2000w_client_get_image,\ ---wrap,kds_s2000w_client_get_metadata,\ --wrap,kds_s2000w_convert_tiff_to_pnm,\ --wrap,kds_s2000w_client_delete_image,\ --wrap,kds_s2000w_client_set_option,\ diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index 35e748c..16f6714 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -307,54 +307,6 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* response) return result; } -int kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response) -{ - debug_printf(ALL, "kds_s2000w_client_get_metadata"); - CURL* curl = NULL; - CURLU* url_handler = NULL; - struct curl_slist* headers = NULL; - char header_str[80]; - CURLcode result = 0; - - curl = curl_easy_init(); - if(!curl) - return CURLE_FAILED_INIT; - - url_handler = curl_url(); - char url_path[30]; - sprintf(url_path, "api/session/metadata/%i", img_number); - curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0); - curl_url_set(url_handler, CURLUPART_PATH, url_path, 0); - char* url = NULL; - curl_url_get(url_handler, CURLUPART_URL, &url, 0); - - headers = NULL; - sprintf(header_str, "SessionId: %li", sessionid); - headers = curl_slist_append(headers, header_str); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl, CURLOPT_URL, url); - curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L); - curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, _kds_s2000w_client_callback); - curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*) response); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); - curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); - result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); - _kds_s2000w_client_read_error_status(curl, response); - - if (result != CURLE_OK) - fprintf(stderr, "ERROR: curl_easy_perform: %s\n", curl_easy_strerror(result)); - - curl_url_cleanup(url_handler); - url_handler = NULL; - curl_free(url); - url = NULL; - curl_easy_cleanup(curl); - curl = NULL; - - return result; -} - int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response) { debug_printf(ALL, "kds_s2000w_client_get_image"); diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h index 4b7ee72..b79bb8a 100644 --- a/src/kds_s2000w_client.h +++ b/src/kds_s2000w_client.h @@ -15,7 +15,6 @@ void kds_s2000w_client_close_session(int64_t sessionid); int kds_s2000w_client_status_session(int64_t sessionid, response* response); int kds_s2000w_client_start_scan(int64_t sessionid, response* response); int kds_s2000w_client_stop_scan(int64_t sessionid, response* response); -int kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response); int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response); int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response); int kds_s2000w_client_get_capabilities(response* response); diff --git a/tests/kds_s2000w_client_mock.c b/tests/kds_s2000w_client_mock.c index f1c10e0..22c2df4 100644 --- a/tests/kds_s2000w_client_mock.c +++ b/tests/kds_s2000w_client_mock.c @@ -57,13 +57,6 @@ int __wrap_kds_s2000w_client_get_image(int64_t sessionid, int img_number, respon return mock_type(int); } -int __wrap_kds_s2000w_client_get_metadata(int64_t sessionid, int img_number, response* response) -{ - function_called(); - mock_response(response); - return mock_type(int); -} - int __wrap_kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response) { function_called(); -- 2.39.5