From: Bastian Dehn <hhaalo@arcor.de>
Date: Thu, 1 Aug 2024 08:21:06 +0000 (+0200)
Subject: refactor client variable init
X-Git-Tag: v1.0.4^2~1
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=fe2e72634c39017f96497e9e6ad0634f52343f1a;p=sane-kds-s2000w-net.git

refactor client variable init
---

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index c86ea97..87ca231 100644
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -52,9 +52,7 @@ response* kds_s2000w_client_response_init()
 	debug_printf(ALL, "kds_s2000w_client_response_init");
 #endif
 
-	response* resp = NULL;
-
-	resp = malloc(sizeof(response));
+	response* resp = malloc(sizeof(response));
 	resp->data = malloc(sizeof(char));
 	resp->error_status = malloc(sizeof(char));
 	resp->size = 0;
@@ -88,21 +86,15 @@ int kds_s2000w_client_open_session(response* response)
 
 	_kds_s2000w_client_load_config();
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	char* url = NULL;
-	CURLcode result = 0;
 	char body[50] = {0};
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
-	result = curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
+	CURLU* url_handler = curl_url();
+	CURLcode result = curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/session", 0);
 	curl_url_get(url_handler, CURLUPART_URL, &url, 0);
 	sprintf(body, "{\"OCPUserName\": \"%s\"}", p_config.username);
@@ -110,9 +102,9 @@ int kds_s2000w_client_open_session(response* response)
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_POST, 1L);
 	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body);
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
@@ -147,17 +139,14 @@ void kds_s2000w_client_close_session(int64_t sessionid)
 	debug_printf(ALL, "kds_s2000w_client_close_session");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	struct curl_slist* headers = NULL;
-	CURLcode result = 0;
 	char header_str[80];
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/session", 0);
 	char* url = NULL;
@@ -170,7 +159,7 @@ void kds_s2000w_client_close_session(int64_t sessionid)
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 
 	if (result != CURLE_OK)
 		fprintf(stderr, "ERROR: curl_easy_perform: %s\n", curl_easy_strerror(result));
@@ -193,20 +182,15 @@ int kds_s2000w_client_status_session(int64_t sessionid, response* response)
 
 	join_thread();
 	wait_seconds(&p_config.heartbeat);
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
+
 	struct curl_slist* headers = NULL;
-	CURLcode result = 0;
 	char header_str[80];
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/session/status", 0);
 	char* url = NULL;
@@ -217,13 +201,13 @@ int kds_s2000w_client_status_session(int64_t sessionid, response* response)
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);
 
@@ -254,39 +238,32 @@ int kds_s2000w_client_start_scan(int64_t sessionid, response* response)
 	debug_printf(ALL, "kds_s2000w_client_start_scan");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	char* url = NULL;
 	struct curl_slist* headers = NULL;
-	CURLcode result = 0;
 	char header_str[80];
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/session/startscan", 0);
 	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_POST, 1L);
 	curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0L);
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);
 
@@ -317,20 +294,14 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
 	debug_printf(ALL, "kds_s2000w_client_stop_scan");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	struct curl_slist* headers = NULL;
-	CURLcode result = 0;
 	char header_str[80];
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/session/stopscan", 0);
 	char* url = NULL;
@@ -342,13 +313,13 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* response)
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_POST, 1L);
 	curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0L);
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);
 
@@ -379,22 +350,16 @@ int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* res
 	debug_printf(ALL, "kds_s2000w_client_get_image");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	struct curl_slist* headers = NULL;
 	char* url = NULL;
 	char url_path[30];
 	char header_str[80];
-	CURLcode result = 0;
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	sprintf(url_path, "api/session/image/%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);
@@ -405,13 +370,13 @@ int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* res
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);
 
@@ -442,22 +407,16 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response*
 	debug_printf(ALL, "kds_s2000w_client_delete_image");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	char* url = NULL;
 	struct curl_slist* headers = NULL;
 	char url_path[30];
 	char header_str[80];
-	CURLcode result = 0;
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	sprintf(url_path, "api/session/image/%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);
@@ -468,13 +427,13 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response*
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);
 
@@ -505,32 +464,26 @@ int kds_s2000w_client_get_capabilities(response* response)
 	debug_printf(ALL, "kds_s2000w_client_get_capabilities");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler =NULL;
 	char* url = NULL;
-	CURLcode result = 0;
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/scanner/capabilities?V2", 0);
 	curl_url_get(url_handler, CURLUPART_URL, &url, 0);
 
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);
 
@@ -561,20 +514,14 @@ int kds_s2000w_client_get_option(int64_t sessionid, response* response)
 	debug_printf(ALL, "kds_s2000w_client_get_option");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	struct curl_slist* headers = NULL;
 	char header_str[80];
-	CURLcode result = 0;
-	FILE* stream = NULL;
-	char* buffer = NULL;
-	size_t* sizeloc = NULL;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/session/configuration", 0);
 	char* url = NULL;
@@ -585,13 +532,13 @@ int kds_s2000w_client_get_option(int64_t sessionid, response* response)
 	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_HTTPGET, 1L);
-	buffer = malloc(sizeof(char));
-	sizeloc = malloc(sizeof(size_t));
-	stream = open_memstream(&buffer, sizeloc);
+	char* buffer = malloc(sizeof(char));
+	size_t* sizeloc = malloc(sizeof(size_t));
+	FILE* stream = open_memstream(&buffer, sizeloc);
 	curl_easy_setopt(curl, CURLOPT_WRITEDATA, stream);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);
 
@@ -622,18 +569,15 @@ int kds_s2000w_client_set_option(int64_t sessionid, response* response)
 	debug_printf(ALL, "kds_s2000w_client_set_option");
 #endif
 
-	CURL* curl = NULL;
-	CURLU* url_handler = NULL;
 	char* url = NULL;
 	struct curl_slist* headers = NULL;
 	char header_str[80];
-	CURLcode result = 0;
 
-	curl = curl_easy_init();
+	CURL* curl = curl_easy_init();
 	if(!curl)
 		return CURLE_FAILED_INIT;
 
-	url_handler = curl_url();
+	CURLU* url_handler = curl_url();
 	curl_url_set(url_handler, CURLUPART_URL, p_config.scanner_url, 0);
 	curl_url_set(url_handler, CURLUPART_PATH, "/api/session/configuration", 0);
 	curl_url_get(url_handler, CURLUPART_URL, &url, 0);
@@ -647,7 +591,7 @@ int kds_s2000w_client_set_option(int64_t sessionid, response* response)
 	curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, response->size);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
 	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
-	result = curl_easy_perform(curl);
+	CURLcode result = curl_easy_perform(curl);
 	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &response->code);
 	_kds_s2000w_client_read_error_status(curl, response);