From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 18 Oct 2025 08:02:55 +0000 (+0200)
Subject: change types of enums
X-Git-Tag: v1.1.14^2~3
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=d7ec8f5004b77cecbdcfc770919fdf127f707841;p=sane-kds-s2000w-net.git

change types of enums
---

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 170a46f..5381fab 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -158,7 +158,7 @@ void kds_s2000w_handler_reset(handler_t* h)
 	h->scan_status->read_bytes = 0;
 }
 
-uint8_t kds_s2000w_handler_open(const char* devicename, void** handle)
+connection_state_t kds_s2000w_handler_open(const char* devicename, void** handle)
 {
 	kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_open");
 
diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 58203bf..eb0ca83 100644
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -4,29 +4,23 @@
 #include <stdbool.h>
 #include <json-c/json.h>
 
-enum {
-	NOTCONNECTED,
-	OPENED,
-	BUSY
-};
-
 enum {
 	RELOAD_OPTIONS = 2,
 	RELOAD_PARAMS = 4
 };
 
-enum {
-	Flatbed,
-	DocumentFeeder,
-	Automatic
-};
+typedef enum {
+	NOTCONNECTED,
+	OPENED,
+	BUSY
+} connection_state_t;
 
-enum {
+typedef enum {
 	STOPPED,
 	STARTED,
 	CANCLED,
 	COMPLETED
-};
+} scan_state_t;
 
 typedef struct {
 	size_t size;
@@ -50,7 +44,7 @@ typedef struct {
 } coord_t;
 
 typedef struct {
-	uint8_t state;
+	scan_state_t state;
 	uint8_t image_number;
 	uint8_t available_images;
 	uint8_t downloaded_images;
@@ -70,7 +64,7 @@ handler_t* kds_s2000w_handler_init();
 void kds_s2000w_handler_free(handler_t* h);
 void kds_s2000w_handler_reset(handler_t* h);
 
-uint8_t kds_s2000w_handler_open(const char* devicename, void** handle);
+connection_state_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 aef2244..e9e45b1 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;
 
-	uint8_t connection_state = kds_s2000w_handler_open(devicename, handle);
+	connection_state_t state = kds_s2000w_handler_open(devicename, handle);
 	if (handle == NULL)
 		return SANE_STATUS_NO_MEM;
 
 	handler_t* h = (handler_t*) *handle;
 
-	if (connection_state == NOTCONNECTED) {
+	if (state == NOTCONNECTED) {
 		kds_s2000w_handler_free(h);
 		h = NULL;
 		*handle = NULL;
 		return SANE_STATUS_IO_ERROR;
 	}
 
-	if (connection_state == BUSY) {
+	if (state == BUSY) {
 		kds_s2000w_handler_free(h);
 		h = NULL;
 		*handle = NULL;