assertion for read size with header

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index a98117269950469c05644824cc88d9144139cf23..4b8b60d7df1fbb861e716fa0c985459642615445 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -269,12 +269,10 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        }
 
        int skip_header_bytes = _sane_kds_s2000w_net_find_first_data_byte(current_metadata.image);
-       
-       if (read_size <= 0) {
+       if (read_size <= 0)
                read_size += skip_header_bytes;
-       }
 
-       if (readed_lines >= current_metadata.lines ) {
+       if (readed_lines >= current_metadata.lines) {
                read_size = 0;
                *length = 0;
                readed_lines = 0;

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 22ee514fc1651a1b2836c12a28c17e704922b6d4..305fa878ceffadbb953d3a4e410fb3cf7f089e2f 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -14,6 +14,7 @@ void void_mock() {}
 
 START_TEST(sane_kds_s2000w_net_find_first_data_byte_test)
 {
+
        char data[] = {
                0x50, 0x36, 0x0a, 0x31,
                0x31, 0x35, 0x39, 0x20,
@@ -29,6 +30,8 @@ END_TEST
 
 START_TEST(sane_kds_s2000w_net_read_test)
 {
+       int* read_size_ptr = get_read_size();
+       *read_size_ptr = 0;
        metadata* current_metadata_ptr = get_current_metadata();
        int* read_size = get_read_size();
        *read_size = 0;
@@ -50,6 +53,7 @@ START_TEST(sane_kds_s2000w_net_read_test)
 
        ck_assert_int_eq(*length, 65536);
        ck_assert_mem_eq(dataptr, image + 3, 65536);
+       ck_assert_int_eq(*read_size_ptr, 65539);
 
        free(dataptr);
        dataptr = NULL;