move reade bytes per line in readinfo

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index ff90fc386a00f6a00b972c7282ad6d7e211f1f5a..6b3537ddf52880174fae18de6fa3864846309e67 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -27,8 +27,6 @@ readinfo* get_read_info()
 [[deprecated("use reade_info instead")]]
 metadata current_metadata;
 [[deprecated("use reade_info instead")]]
-int readed_bytes_per_line = 0;
-[[deprecated("use reade_info instead")]]
 int readed_lines = 0;
 
 [[deprecated("use reade_info instead")]]
@@ -43,12 +41,6 @@ int* get_readed_lines()
        return &readed_lines;
 }
 
-[[deprecated("use reade_info instead")]]
-int* get_readed_bytes_per_line()
-{
-       return &readed_bytes_per_line;
-}
-
 int _sane_kds_s2000w_net_find_first_data_byte(const char* data)
 {
        const int header_spaces = 3;
@@ -257,7 +249,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        params->depth = current_metadata.depth;
        read_info.read_size = 0;
        readed_lines = 0;
-       readed_bytes_per_line = 0;
+       read_info.readed_bytes_per_line = 0;
 
        return SANE_STATUS_GOOD;
 }
@@ -298,17 +290,17 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        }
 
        int maxlen = max_length;
-       if (current_metadata.bytes_per_line - readed_bytes_per_line < max_length)
-               maxlen = current_metadata.bytes_per_line - readed_bytes_per_line;
+       if (current_metadata.bytes_per_line - read_info.readed_bytes_per_line < max_length)
+               maxlen = current_metadata.bytes_per_line - read_info.readed_bytes_per_line;
 
        *length = maxlen;
        memcpy(data, current_metadata.image + read_info.read_size, *length);
 
-       readed_bytes_per_line += *length;
+       read_info.readed_bytes_per_line += *length;
        read_info.read_size += *length;
 
-       if (readed_bytes_per_line >= current_metadata.bytes_per_line) {
-               readed_bytes_per_line = 0;
+       if (read_info.readed_bytes_per_line >= current_metadata.bytes_per_line) {
+               read_info.readed_bytes_per_line = 0;
                readed_lines++;
        }
 

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index d62977c777bfd5955fdccc8c63ebcf52715efab5..7e5c89fc988477f367ecebddda3e86b9901923e9 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -123,8 +123,6 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        readinfo* read_info = get_read_info();
        read_info->read_size = 0;
        metadata* current_metadata_ptr = get_current_metadata();
-       int* readed_bytes_per_line = get_readed_bytes_per_line();
-       readed_bytes_per_line = 0;
        current_metadata_ptr->lines = 1;
        current_metadata_ptr->bytes_per_line = 95000;
        char* image = malloc(sizeof(char) * 95003);