From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 18 Oct 2025 07:35:11 +0000 (+0200)
Subject: change remove connection state from handler
X-Git-Tag: v1.1.14^2~4
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=062b2f39131ec63008787a31fb097d244b04a556;p=sane-kds-s2000w-net.git

change remove connection state from handler
---

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 14f94de..170a46f 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -106,7 +106,6 @@ handler_t* kds_s2000w_handler_init()
 
 	h->profile = 0;
 	h->sessionid = 0;
-	h->state = NOTCONNECTED;
 	h->scan_status->state = STOPPED;
 	h->scan_status->image_number = 1;
 	h->scan_status->available_images = 0;
@@ -159,16 +158,16 @@ void kds_s2000w_handler_reset(handler_t* h)
 	h->scan_status->read_bytes = 0;
 }
 
-void kds_s2000w_handler_open(const char* devicename, void** handle)
+uint8_t kds_s2000w_handler_open(const char* devicename, void** handle)
 {
 	kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_open");
 
 	if (strcmp(devicename, DEVICE_NAME) != 0)
-		return;
+		return NOTCONNECTED;
 
 	handler_t* h = kds_s2000w_handler_init();
 	if (h == NULL)
-		return;
+		return NOTCONNECTED;
 
 	*handle = h;
 	_kds_s2000w_handler_load_config(h);
@@ -177,6 +176,7 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 	/* status code 408 request timeout waking up repeat open session */
 	response_t* resp = NULL;
 	uint8_t result = 0;
+	uint8_t connection_state = NOTCONNECTED;
 	for (uint32_t i = 0; i < ATTEMPT; i++) {
 		kds_s2000w_client_response_free(resp);
 		resp = NULL;
@@ -184,17 +184,17 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 		result = kds_s2000w_client_open_session(resp);
 
 		if (result != 0) {
-			h->state = NOTCONNECTED;
+			connection_state = NOTCONNECTED;
 			break;
 		}
 
 		if (resp->code == 200) {
-			h->state = OPENED;
+			connection_state = OPENED;
 			break;
 		}
 
 		if (resp->code == 423) {
-			h->state = BUSY;
+			connection_state = BUSY;
 			break;
 		}
 
@@ -205,7 +205,7 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 		kds_s2000w_client_response_free(resp);
 		resp = NULL;
 		kds_s2000w_client_free();
-		return;
+		return connection_state;
 	}
 
 	h->scanner_config = json_tokener_parse(resp->data);
@@ -219,6 +219,8 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 	h->scanner_config = NULL;
 	kds_s2000w_client_response_free(resp);
 	resp = NULL;
+
+	return connection_state;
 }
 
 void kds_s2000w_handler_close(handler_t* h)
diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 4a6b7cf..58203bf 100644
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -60,7 +60,6 @@ typedef struct {
 typedef struct {
 	uint8_t profile;
 	uint64_t sessionid;
-	uint8_t state;
 	json_object* scanner_config;
 	scan_status_t* scan_status;
 	imagedata_t* image;
@@ -71,7 +70,7 @@ handler_t* kds_s2000w_handler_init();
 void kds_s2000w_handler_free(handler_t* h);
 void kds_s2000w_handler_reset(handler_t* h);
 
-void kds_s2000w_handler_open(const char* devicename, void** handle);
+uint8_t kds_s2000w_handler_open(const char* devicename, void** handle);
 void kds_s2000w_handler_close(handler_t* h);
 void kds_s2000w_handler_recreate_session(handler_t* h);
 
diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 7b91e9f..aef2244 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -77,20 +77,20 @@ SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename,
 	if (strcmp(devicename, NAME) != 0)
 		return SANE_STATUS_INVAL;
 
-	kds_s2000w_handler_open(devicename, handle);
+	uint8_t connection_state = kds_s2000w_handler_open(devicename, handle);
 	if (handle == NULL)
 		return SANE_STATUS_NO_MEM;
 
 	handler_t* h = (handler_t*) *handle;
 
-	if (h->state == NOTCONNECTED) {
+	if (connection_state == NOTCONNECTED) {
 		kds_s2000w_handler_free(h);
 		h = NULL;
 		*handle = NULL;
 		return SANE_STATUS_IO_ERROR;
 	}
 
-	if (h->state == BUSY) {
+	if (connection_state == BUSY) {
 		kds_s2000w_handler_free(h);
 		h = NULL;
 		*handle = NULL;
@@ -105,7 +105,7 @@ void sane_kds_s2000w_net_close(SANE_Handle handle)
 	kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_close");
 
 	const handler_t* h = (const handler_t*) handle;
-	if (h == NULL || h->state != OPENED)
+	if (h == NULL)
 		return;
 
 	kds_s2000w_option_descriptors_free();