]> gitweb.hhaalo.de Git - sane-kds-s2000w-net.git/commitdiff
refactor max length calc
authorBastian Dehn <hhaalo@arcor.de>
Sat, 18 May 2024 06:18:56 +0000 (08:18 +0200)
committerBastian Dehn <hhaalo@arcor.de>
Sat, 18 May 2024 06:18:56 +0000 (08:18 +0200)
src/kds_s2000w_net.c

index 8375822351cb056da952891dee3c3cb4eb10f0dd..593ac3ac611d1ec4039c186a6ae20602ed5ef38c 100644 (file)
@@ -229,16 +229,14 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        }
 
        // calc max length
-       int maxlen = max_length;
-       int rest_size = h->pnm_image->size - h->read_info->read_size;
-       if (rest_size < max_length)
-               maxlen = rest_size;
+       *length = h->pnm_image->size - h->read_info->read_size;
+       if (*length > max_length)
+               *length = max_length;
 
        // read image
        if (h->pnm_image->data != NULL && h->read_info->read_size <= 0)
                h->read_info->read_size += _sane_kds_s2000w_net_find_first_data_byte(h->pnm_image->data);
 
-       *length = maxlen;
        memcpy(data, h->pnm_image->data + h->read_info->read_size, *length);
        h->read_info->read_size += *length;