optimize read tests

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index b6e1fcd44157a237f033b7e61819bdec627a9552..aacb4f977daf05afa90bfb482eb200abea3c19b1 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -44,10 +44,7 @@ START_TEST(sane_kds_s2000w_net_read_empty_image)
 {
        int length = 0;
        handler* h = init_handler();
-       h->pnm_image->size = 1;
-       char* image = malloc(sizeof(char));
-       image[0] = 0;
-       h->pnm_image->data = image;
+       h->pnm_image->data = malloc(sizeof(char));;
        h->pnm_image->size = 0;
        char* dataptr = malloc(sizeof(char));
 
@@ -57,7 +54,6 @@ START_TEST(sane_kds_s2000w_net_read_empty_image)
 
        free(dataptr);
        dataptr = NULL;
-       image = NULL;
        free_handler(h);
        h = NULL;
 }
@@ -70,12 +66,12 @@ START_TEST(sane_kds_s2000w_net_read_test)
        h->read_info->read_size = 0;
        h->current_metadata->format = 0;
        h->pnm_image->size = 65539;
-       char* image = malloc(sizeof(char) * 65539);
+       h->pnm_image->data = malloc(sizeof(char) * 65539);
+       char* imagedata = (char*) h->pnm_image->data;
        for (int i = 0; i < 3; i++) {
-               image[i] = 0x0a;
+               imagedata[i] = 0x0a;
        }
-       image[3] = 0xff;
-       h->pnm_image->data = image;
+       imagedata[3] = 0xff;
 
        SANE_Int maxlen = 65536;
        char* dataptr = malloc(sizeof(char) * maxlen);
@@ -84,14 +80,13 @@ START_TEST(sane_kds_s2000w_net_read_test)
        _sane_kds_s2000w_net_read(h, dataptr, maxlen, length);
 
        ck_assert_int_eq(*length, 65536);
-       ck_assert_mem_eq(dataptr, image + 3, 65536);
+       ck_assert_mem_eq(dataptr, h->pnm_image->data + 3, 65536);
        ck_assert_int_eq(h->read_info->read_size, 65539);
 
        free(dataptr);
        dataptr = NULL;
        free(length);
        length = NULL;
-       image = NULL;
        free_handler(h);
        h = NULL;
 }
@@ -105,12 +100,12 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        h->read_info->read_size = 0;
        h->current_metadata->format = 0;
        h->pnm_image->size = 95003;
-       char* image = malloc(sizeof(char) * 95003);
+       h->pnm_image->data = malloc(sizeof(char) * 95003);
+       char* image = (char*) h->pnm_image->data;
        for (int i = 0; i < 3; i++) {
                image[i] = 0x0a;
        }
        image[3] = 0xff;
-       h->pnm_image->data = image;
 
        SANE_Int maxlen = 65536;
        char* dataptr = malloc(sizeof(char) * maxlen);
@@ -125,7 +120,6 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
        dataptr = NULL;
        free(length);
        length = NULL;
-       image = NULL;
        free_handler(h);
        h = NULL;
 }