change types of enums

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 170a46fa0e73fa24888ca07d148087ef976053b0..5381fabc59debf4ff2bfceba0fe6d12c44bfe9f5 100644 (file)
--- 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 58203bfa4bd56ebb0038dc23e0342d0347a161cb..eb0ca837ac0a749f4cd039d109c5b090a8698414 100644 (file)
--- 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 aef22441dc711799d63914a3c9e731c6e164d53f..e9e45b1b9e5e9824f869b3434802c93ff2ece134 100644 (file)
--- 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;