move readed lines into handler

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index e401b9ec995d5bf3cbf870ef9a64a01abac43b55..1ae68f9f26d8cc790b9c48cdc18c58a871917a25 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -147,7 +147,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        params->depth = read_info.current_metadata.depth;
        h->read_info.read_size = 0;
        h->read_info.readed_bytes_per_line = 0;
-       read_info.readed_lines = 0;
+       h->read_info.readed_lines = 0;
 
        debug_printf_int(DEBUG, "format", params->format);
        debug_printf_int(DEBUG, "last frame", params->last_frame);
@@ -188,9 +188,9 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        if (h->read_info.read_size <= 0)
                h->read_info.read_size += skip_header_bytes;
 
-       if (read_info.readed_lines >= read_info.current_metadata.lines) {
+       if (h->read_info.readed_lines >= read_info.current_metadata.lines) {
                *length = 0;
-               read_info.readed_lines = 0;
+               h->read_info.readed_lines = 0;
                return SANE_STATUS_EOF;
        }
 
@@ -206,7 +206,7 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 
        if (h->read_info.readed_bytes_per_line >= read_info.current_metadata.bytes_per_line) {
                h->read_info.readed_bytes_per_line = 0;
-               read_info.readed_lines++;
+               h->read_info.readed_lines++;
        }
 
        return SANE_STATUS_GOOD;

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index baf1efc31146c51e73f26f7c48f85053a95de050..1f8cb3e0ddd229f2801a011111f36977138f610c 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -80,6 +80,7 @@ START_TEST(sane_kds_s2000w_net_read_test)
        h.read_info.cancel = 0;
        h.read_info.read_size = 0;
        h.read_info.readed_bytes_per_line = 0;
+       h.read_info.readed_lines = 0;
        read_info->current_metadata.format = 0;
        read_info->current_metadata.lines = 1;
        read_info->current_metadata.bytes_per_line = 65536;
@@ -117,6 +118,7 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        h.read_info.cancel = 0;
        h.read_info.read_size = 0;
        h.read_info.readed_bytes_per_line = 0;
+       h.read_info.readed_lines = 0;
        read_info->current_metadata.format = 0;
        read_info->current_metadata.lines = 1;
        read_info->current_metadata.bytes_per_line = 95000;