From 4a639f45a7704e26cff8a39cf48e994ff150647d Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 4 Jan 2025 09:10:34 +0100 Subject: [PATCH] rename responses another as its type --- src/kds_s2000w_client.c | 90 ++++++++++++++++++++--------------------- src/kds_s2000w_client.h | 20 ++++----- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index 52d11fa..8c2b06a 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -82,19 +82,19 @@ response* kds_s2000w_client_response_init() return resp; } -void kds_s2000w_client_response_free(response* response) +void kds_s2000w_client_response_free(response* resp) { debug_printf(ALL, "kds_s2000w_client_response_free"); - if (response == NULL) + if (resp == NULL) return; - free(response->error_status); - response->error_status = NULL; - free(response->data); - response->data = NULL; - free(response); - response = NULL; + free(resp->error_status); + resp->error_status = NULL; + free(resp->data); + resp->data = NULL; + free(resp); + resp = NULL; } void kds_s2000w_client_init() @@ -116,7 +116,7 @@ void kds_s2000w_client_free() curl = NULL; } -int kds_s2000w_client_open_session(response* response) +int kds_s2000w_client_open_session(response* resp) { debug_printf(ALL, "kds_s2000w_client_open_session"); @@ -147,13 +147,13 @@ int kds_s2000w_client_open_session(response* response) _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -211,7 +211,7 @@ void kds_s2000w_client_close_session(int64_t sessionid) header_str = NULL; } -int kds_s2000w_client_status_session(int64_t sessionid, response* response) +int kds_s2000w_client_status_session(int64_t sessionid, response* resp) { debug_printf(ALL, "kds_s2000w_client_status_session"); @@ -245,13 +245,13 @@ int kds_s2000w_client_status_session(int64_t sessionid, response* response) _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -270,7 +270,7 @@ int kds_s2000w_client_status_session(int64_t sessionid, response* response) return result; } -int kds_s2000w_client_start_scan(int64_t sessionid, response* response) +int kds_s2000w_client_start_scan(int64_t sessionid, response* resp) { debug_printf(ALL, "kds_s2000w_client_start_scan"); @@ -302,13 +302,13 @@ int kds_s2000w_client_start_scan(int64_t sessionid, response* response) _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -327,7 +327,7 @@ int kds_s2000w_client_start_scan(int64_t sessionid, response* response) return result; } -int kds_s2000w_client_stop_scan(int64_t sessionid, response* response) +int kds_s2000w_client_stop_scan(int64_t sessionid, response* resp) { debug_printf(ALL, "kds_s2000w_client_stop_scan"); @@ -359,13 +359,13 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* response) _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -384,7 +384,7 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* response) return result; } -int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* response) +int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* resp) { debug_printf(ALL, "kds_s2000w_client_get_image"); @@ -418,13 +418,13 @@ int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* res _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -445,7 +445,7 @@ int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* res return result; } -int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* response) +int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* resp) { debug_printf(ALL, "kds_s2000w_client_delete_image"); @@ -479,13 +479,13 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -504,7 +504,7 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* return result; } -int kds_s2000w_client_get_capabilities(response* response) +int kds_s2000w_client_get_capabilities(response* resp) { debug_printf(ALL, "kds_s2000w_client_get_capabilities"); @@ -531,13 +531,13 @@ int kds_s2000w_client_get_capabilities(response* response) _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -554,7 +554,7 @@ int kds_s2000w_client_get_capabilities(response* response) return result; } -int kds_s2000w_client_get_option(int64_t sessionid, response* response) +int kds_s2000w_client_get_option(int64_t sessionid, response* resp) { debug_printf(ALL, "kds_s2000w_client_get_option"); @@ -585,13 +585,13 @@ int kds_s2000w_client_get_option(int64_t sessionid, response* response) _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); fflush(stream); - _kds_s2000w_client_stream_to_response(stream, response, sizeloc); + _kds_s2000w_client_stream_to_response(stream, resp, sizeloc); fclose(stream); curl_url_cleanup(url_handler); @@ -610,7 +610,7 @@ int kds_s2000w_client_get_option(int64_t sessionid, response* response) return result; } -int kds_s2000w_client_set_option(int64_t sessionid, response* response) +int kds_s2000w_client_set_option(int64_t sessionid, response* resp) { debug_printf(ALL, "kds_s2000w_client_set_option"); @@ -632,15 +632,15 @@ int kds_s2000w_client_set_option(int64_t sessionid, response* response) headers = curl_slist_append(headers, ACCEPT_JSON_HEADER); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl, CURLOPT_POSTFIELDS, response->data); - curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, response->size); + curl_easy_setopt(curl, CURLOPT_POSTFIELDS, resp->data); + curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, resp->size); curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT"); _kds_s2000w_client_set_ssl_verification_off(curl); CURLcode result = curl_easy_perform(curl); - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code); + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &resp->code); - _kds_s2000w_client_read_error_status(curl, response); + _kds_s2000w_client_read_error_status(curl, resp); _kds_s2000w_client_print_error_result(result); curl_url_cleanup(url_handler); diff --git a/src/kds_s2000w_client.h b/src/kds_s2000w_client.h index f2572a9..abd7bd0 100644 --- a/src/kds_s2000w_client.h +++ b/src/kds_s2000w_client.h @@ -9,17 +9,17 @@ typedef struct { } response; response* kds_s2000w_client_response_init(); -void kds_s2000w_client_response_free(response* response); +void kds_s2000w_client_response_free(response* resp); void kds_s2000w_client_init(); void kds_s2000w_client_free(); -int kds_s2000w_client_open_session(response* response); +int kds_s2000w_client_open_session(response* resp); 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_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); -int kds_s2000w_client_get_option(int64_t sessionid, response* response); -int kds_s2000w_client_set_option(int64_t sessionid, response* response); +int kds_s2000w_client_status_session(int64_t sessionid, response* resp); +int kds_s2000w_client_start_scan(int64_t sessionid, response* resp); +int kds_s2000w_client_stop_scan(int64_t sessionid, response* resp); +int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* resp); +int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response* resp); +int kds_s2000w_client_get_capabilities(response* resp); +int kds_s2000w_client_get_option(int64_t sessionid, response* resp); +int kds_s2000w_client_set_option(int64_t sessionid, response* resp); #endif \ No newline at end of file -- 2.39.5