change cancel to bool

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index fc93f235540d8f2a4faf2d6920a2d8d1b8e09fce..99bd7f508d68ebf72e4602e7e73ce48cb216b3ec 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -51,7 +51,7 @@ handler* kds_s2000w_handler_init()
        h->current_scan_status->complete_scanned = false;
        h->current_scan_status->feeder = 1;
        h->read_info->scan_started = false;
-       h->read_info->cancel = 0;
+       h->read_info->cancel = false;
        h->read_info->read_size = 0;
        h->image->size = 0;
        h->image->data = NULL;
@@ -95,7 +95,7 @@ void kds_s2000w_handler_reset(handler* h)
        h->current_scan_status->downloaded_images = 0;
        h->current_scan_status->complete_scanned = false;
        h->read_info->scan_started = false;
-       h->read_info->cancel = 0;
+       h->read_info->cancel = false;
        h->read_info->read_size = 0;
 }
 

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 0afd72960ff2e3584296d8700bbb71e0350fc04f..2fd321f08f9aebf2b4a3a70252374a4620d4dfc2 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -39,7 +39,7 @@ typedef struct {
 
 typedef struct {
        bool scan_started;
-       uint8_t cancel;
+       bool cancel;
        uint64_t read_size;
 } readinfo;
 

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 0e01aa3eef21d5ec34dca65430104982976d0932..64c326061059e05f9561cbf371d6dd38ed3ed9b6 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -133,7 +133,7 @@ SANE_Status sane_kds_s2000w_net_start(SANE_Handle handle)
                return SANE_STATUS_CANCELLED;
 
        if (!h->read_info->scan_started) {
-               h->read_info->cancel = 0;
+               h->read_info->cancel = false;
                h->read_info->scan_started = true;
                kds_s2000w_handler_start_scan(h);
        }
@@ -192,7 +192,7 @@ void sane_kds_s2000w_net_cancel(SANE_Handle handle)
 
        handler* h = (handler*) handle;
 
-       if (h->read_info->cancel > 0) {
+       if (h->read_info->cancel) {
                kds_s2000w_debug_printf(DEBUG, "scan completed canceled");
                kds_s2000w_handler_reset(h);
                kds_s2000w_handler_recreate_session(h);
@@ -215,7 +215,7 @@ void sane_kds_s2000w_net_cancel(SANE_Handle handle)
        }
 
        kds_s2000w_debug_printf(DEBUG, "scan canceled");
-       h->read_info->cancel = 1;
+       h->read_info->cancel = true;
        kds_s2000w_handler_stop_scan(h);
 }
 

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index cf3c9bc38f3cdc495d7def046e64208ec71b1b2f..e597776f698fa7a44940bed883e0fa9b8ec54326 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -75,7 +75,7 @@ void sane_kds_s2000w_net_read_empty_image_test()
 void sane_kds_s2000w_net_read_bytes_per_line_bigger_test()
 {
        handler* h = kds_s2000w_handler_init();
-       h->read_info->cancel = 0;
+       h->read_info->cancel = false;
        h->read_info->read_size = 0;
        h->image->size = 95003;
        h->image->data = malloc(sizeof(char) * 95003);

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 05220b8728e1f4d026dea77d9cdf99aec7c97fea..8d0e21ec28154342b0003a696ce4abc805ce243d 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -461,7 +461,7 @@ void sane_kds_s2000w_net_cancel_test()
 
        sane_kds_s2000w_net_cancel(h);
 
-       assert_int_equal(h->read_info->cancel, 1);
+       assert_true(h->read_info->cancel);
 
        kds_s2000w_client_response_free(resp);
        resp = NULL;
@@ -474,7 +474,7 @@ void sane_kds_s2000w_net_cancel_test()
 void sane_kds_s2000w_net_cancel_start_test()
 {
        handler* h = kds_s2000w_handler_init();
-       h->read_info->cancel = 1;
+       h->read_info->cancel = true;
 
        SANE_Status status = sane_kds_s2000w_net_start(h);
 
@@ -503,11 +503,11 @@ void sane_kds_s2000w_net_cancel_canceled_test()
        expect_function_call(__wrap_kds_s2000w_client_open_session);
        expect_function_call(__wrap_kds_s2000w_client_set_option);
        handler* h = kds_s2000w_handler_init();
-       h->read_info->cancel = 1;
+       h->read_info->cancel = true;
 
        sane_kds_s2000w_net_cancel(h);
 
-       assert_int_equal(h->read_info->cancel, 0);
+       assert_false(h->read_info->cancel);
 
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
@@ -542,7 +542,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder_test()
 
        sane_kds_s2000w_net_cancel(h);
 
-       assert_int_equal(h->read_info->cancel, 0);
+       assert_false(h->read_info->cancel);
        assert_false(h->current_scan_status->complete_scanned);
 
        kds_s2000w_client_response_free(resp_status);
@@ -592,7 +592,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
 
        sane_kds_s2000w_net_cancel(h);
 
-       assert_int_equal(h->read_info->cancel, 0);
+       assert_false(h->read_info->cancel);
        assert_false(h->current_scan_status->complete_scanned);
 
        kds_s2000w_client_response_free(resp_status);