From 1ae8e7d151aef0bba45d530139992ba8f542c4af Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Wed, 15 Oct 2025 09:02:25 +0200 Subject: [PATCH] optimize close session with param --- src/kds_s2000w_client.c | 53 +++++++++-------------------------------- 1 file changed, 11 insertions(+), 42 deletions(-) diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c index 4ae439c..c7cd010 100644 --- a/src/kds_s2000w_client.c +++ b/src/kds_s2000w_client.c @@ -310,53 +310,22 @@ void kds_s2000w_client_close_session(int64_t sessionid) { kds_s2000w_debug_printf(ALL, "kds_s2000w_client_close_session"); - CURL* curl = curl_easy_init(); - char* url = NULL; - CURLU* url_handler = curl_url(); - curl_url_set(url_handler, CURLUPART_URL, client_config->scanner_url, 0); - curl_url_set(url_handler, CURLUPART_PATH, SESSION_PATH, 0); - curl_url_get(url_handler, CURLUPART_URL, &url, 0); - curl_easy_setopt(curl, CURLOPT_URL, url); - - struct curl_slist* headers = NULL; - char* header_str = malloc(sizeof(char) * MAX_STR_BUFFER_LENGTH); - if (header_str == NULL) { - curl_url_cleanup(url_handler); - url_handler = NULL; - curl_free(url); - url = NULL; + curl_param_t* param = _kds_s2000w_client_param_init(sessionid); + if (param == NULL) return; - } - - memset(header_str, 0, MAX_STR_BUFFER_LENGTH); - sprintf(header_str, "SessionId: %li", sessionid); - headers = curl_slist_append(headers, header_str); - headers = curl_slist_append(headers, CONTENT_TYPE_HEADER); - headers = curl_slist_append(headers, ACCEPT_JSON_HEADER); - curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, HTTP_DELETE); - _kds_s2000w_client_set_ssl_verification_off(curl); + curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0); + curl_url_set(param->url_handler, CURLUPART_PATH, SESSION_PATH, 0); + curl_url_get(param->url_handler, CURLUPART_URL, ¶m->url, 0); + curl_easy_setopt(param->curl, CURLOPT_URL, param->url); - char* errbuf = _kds_s2000w_client_errbuf_init(); - curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf); - _kds_s2000w_client_set_verbose(curl); - CURLcode result = curl_easy_perform(curl); + curl_easy_setopt(param->curl, CURLOPT_CUSTOMREQUEST, HTTP_DELETE); + CURLcode result = curl_easy_perform(param->curl); - _kds_s2000w_client_print_error_result(result, errbuf); + _kds_s2000w_client_print_error_result(result, param->errbuf); - curl_url_cleanup(url_handler); - url_handler = NULL; - curl_free(url); - url = NULL; - curl_slist_free_all(headers); - headers = NULL; - curl_easy_cleanup(curl); - curl = NULL; - free(header_str); - header_str = NULL; - free(errbuf); - errbuf = NULL; + _kds_s2000w_client_param_free(param); + param = NULL; } uint8_t kds_s2000w_client_get_capabilities(response* resp) -- 2.47.3