change rename image number

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 2234fa2302f6ab28e7a1f093dc1b10e276812132..5fcc4a9da9f4e226f2e7def8f047c7e1892817f1 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -108,7 +108,7 @@ handler* kds_s2000w_handler_init()
        h->profile = 0;
        h->sessionid = 0;
        h->state = NOTCONNECTED;
-       h->scan_status->current_image_number = 1;
+       h->scan_status->image_number = 1;
        h->scan_status->available_images = 0;
        h->scan_status->downloaded_images = 0;
        h->scan_status->completed = false;
@@ -157,7 +157,7 @@ void kds_s2000w_handler_reset(handler* h)
        free(h->image->data);
        h->image->data = NULL;
 
-       h->scan_status->current_image_number = 1;
+       h->scan_status->image_number = 1;
        h->scan_status->available_images = 0;
        h->scan_status->downloaded_images = 0;
        h->scan_status->completed = false;
@@ -401,7 +401,7 @@ void kds_s2000w_handler_download_current_image(handler* h)
        h->image->size = 0;
 
        response* resp = kds_s2000w_client_response_init();
-       kds_s2000w_client_get_image(h->sessionid, h->scan_status->current_image_number, resp);
+       kds_s2000w_client_get_image(h->sessionid, h->scan_status->image_number, resp);
        h->image->size = resp->size;
        h->image->data = malloc(sizeof(char) * resp->size);
        memcpy(h->image->data, resp->data, resp->size);
@@ -415,6 +415,6 @@ void kds_s2000w_handler_delete_current_image(handler* h)
 {
        kds_s2000w_debug_printf(ALL, "delete_current_image");
 
-       kds_s2000w_client_delete_image(h->sessionid, h->scan_status->current_image_number);
+       kds_s2000w_client_delete_image(h->sessionid, h->scan_status->image_number);
        h->scan_status->available_images--;
 }
\ No newline at end of file

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 7d5d49f7888ce3a948adb2b3f1ad837ffd77f4fd..7147b9575c57381cc58efdac2e22bacb7962f299 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -43,7 +43,7 @@ typedef struct {
 } coord_t;
 
 typedef struct {
-       uint8_t current_image_number;
+       uint8_t image_number;
        uint8_t available_images;
        uint8_t downloaded_images;
        bool completed;

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 1cfd67c85a483cb4e7a3626462f971e438bdedab..a8780d1a476ca5a8592acaf85393061f544d9645 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -176,7 +176,7 @@ SANE_Status sane_kds_s2000w_net_start(SANE_Handle handle)
 
        kds_s2000w_handler_download_current_image(h);
        kds_s2000w_handler_delete_current_image(h);
-       h->scan_status->current_image_number++;
+       h->scan_status->image_number++;
 
        if (h->scan_status->completed) {
                kds_s2000w_handler_stop_scan(h);