From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 24 Feb 2024 10:15:31 +0000 (+0100)
Subject: change handler in handler file
X-Git-Tag: v1.0.0^2~205
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=4a9169142a9a26230bc813328c08bce863007ace;p=sane-kds-s2000w-net.git

change handler in handler file
---

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index b6a32eb..b3cb0e8 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -266,7 +266,7 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 	return;
 }
 
-void kds_s2000w_handler_close(void* handle)
+void kds_s2000w_handler_close(handler* h)
 {
 	debug_printf(ALL, "kds_s2000w_handler_close");
 	json_object_put(resp_config);
@@ -276,7 +276,6 @@ void kds_s2000w_handler_close(void* handle)
 	free(image.data);
 	image.data = NULL;
 
-	handler* h = (handler*) handle;
 	if (h == NULL)
 		return;
 
@@ -286,10 +285,9 @@ void kds_s2000w_handler_close(void* handle)
 	h = NULL;
 }
 
-void kds_s2000w_handler_start_scan(void* handle)
+void kds_s2000w_handler_start_scan(handler* h)
 {
 	debug_printf(ALL, "kds_s2000w_handler_start_scan");
-	handler* h = (handler*) handle;
 	resp = kds_s2000w_client_response_init();
 	kds_s2000w_client_start_scan(h->sessionid, resp);
 	if (resp->code != 200)
@@ -299,10 +297,9 @@ void kds_s2000w_handler_start_scan(void* handle)
 	resp = NULL;
 }
 
-void kds_s2000w_handler_stop_scan(void* handle)
+void kds_s2000w_handler_stop_scan(handler* h)
 {
 	debug_printf(ALL, "kds_s2000w_handler_stop_scan");
-	handler* h = (handler*) handle;
 	resp = kds_s2000w_client_response_init();
 	kds_s2000w_client_stop_scan(h->sessionid, resp);
 	if (resp->code != 200)
@@ -312,10 +309,9 @@ void kds_s2000w_handler_stop_scan(void* handle)
 	resp = NULL;
 }
 
-void kds_s2000w_handler_get_parameters(void* handle)
+void kds_s2000w_handler_get_parameters(handler* h)
 {
 	debug_printf(ALL, "kds_s2000w_handler_get_parameters");
-	handler* h = (handler*) handle;
 	if (h->current_scan_status->complete_scanned
 		&& h->current_scan_status->available_images <= 0) {
 		h->current_metadata->valid = 1;
diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index fdf6a66..b144adc 100644
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -50,11 +50,11 @@ typedef struct {
 handler* init_handler();
 void free_handler(handler* h);
 void kds_s2000w_handler_open(const char* devicename, void** handle);
-void kds_s2000w_handler_close(void* handle);
-void kds_s2000w_handler_get_option(void* handle, int option, void* value);
-void kds_s2000w_handler_set_option(void* handle, int option, void* value, int* info);
+void kds_s2000w_handler_close(handler* h);
+void kds_s2000w_handler_get_option(handler* handle, int option, void* value);
+void kds_s2000w_handler_set_option(handler* handle, int option, void* value, int* info);
 void kds_s2000w_handler_set_option_auto(int option);
-void kds_s2000w_handler_start_scan(void* handle);
-void kds_s2000w_handler_stop_scan(void* handle);
-void kds_s2000w_handler_get_parameters(void* handle);
+void kds_s2000w_handler_start_scan(handler* h);
+void kds_s2000w_handler_stop_scan(handler* h);
+void kds_s2000w_handler_get_parameters(handler* handle);
 #endif
\ No newline at end of file
diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index e0e2b76..056817d 100644
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -117,10 +117,9 @@ void init_gamma_table()
 	}
 }
 
-void kds_s2000w_handler_get_option(void* handle, int option, void* value)
+void kds_s2000w_handler_get_option(handler* h, int option, void* value)
 {
 	config = json_object_object_get(resp_config, "Configuration");
-	handler* h = (handler*) handle;
 	json_object* value_object = NULL;
 	switch(option) {
 		case 0:
@@ -232,10 +231,9 @@ void kds_s2000w_handler_get_option(void* handle, int option, void* value)
 	}
 }
 
-void kds_s2000w_handler_set_option(void* handle, int option, void* value, int* info)
+void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* info)
 {
 	config = json_object_object_get(resp_config, "Configuration");
-	handler* h = (handler*) handle;
 	json_object* value_object = NULL;
 	switch(option) {
 		case 2:
diff --git a/src/kds_s2000w_handler_opts.h b/src/kds_s2000w_handler_opts.h
index f227b5d..2fdbfd8 100644
--- a/src/kds_s2000w_handler_opts.h
+++ b/src/kds_s2000w_handler_opts.h
@@ -1,7 +1,7 @@
 #ifndef KDS_S2000W_HANDLER_OPTS_H
 #define KDS_S2000W_HANDLER_OPTS_H
 void init_gamma_table();
-void kds_s2000w_handler_get_option(void* handle, int option, void* value);
-void kds_s2000w_handler_set_option(void* handle, int option, void* value, int* info);
+void kds_s2000w_handler_get_option(handler* h, int option, void* value);
+void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* info);
 void kds_s2000w_handler_set_option_auto(int option);
 #endif
\ No newline at end of file
diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 8922ab2..b3b6d62 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -97,11 +97,12 @@ SANE_Status _sane_kds_s2000w_net_control_option(SANE_Handle handle,
 	SANE_Int option, SANE_Action action, void* value, SANE_Int* info)
 {
 	debug_printf(ALL, "sane_kds_s2000w_net_control_option");
+	handler* h = (handler*) handle;
 	if (action == SANE_ACTION_GET_VALUE)
-		kds_s2000w_handler_get_option(handle, option, value);
+		kds_s2000w_handler_get_option(h, option, value);
 
 	if (action == SANE_ACTION_SET_VALUE)
-		kds_s2000w_handler_set_option(handle, option, value, info);
+		kds_s2000w_handler_set_option(h, option, value, info);
 
 	if (action == SANE_ACTION_SET_AUTO)
 		kds_s2000w_handler_set_option_auto(option);
@@ -184,7 +185,7 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle)
 	if (!h->read_info->scan_started) {
 		h->read_info->cancel = 0;
 		h->read_info->scan_started = 1;
-		kds_s2000w_handler_start_scan(handle);
+		kds_s2000w_handler_start_scan(h);
 	}
 	return SANE_STATUS_GOOD;
 }
@@ -198,11 +199,10 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 	if (h->read_info->cancel) {
 		h->read_info->scan_started = 0;
 		*length = 0;
-		kds_s2000w_handler_stop_scan(handle);
+		kds_s2000w_handler_stop_scan(h);
 		sleep(1);
-		kds_s2000w_handler_close(handle);
+		kds_s2000w_handler_close(h);
 		sleep(1);
-		kds_s2000w_handler_open("kds_s2000w_net", handle);
 		return SANE_STATUS_CANCELLED;
 	}