From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 11 Feb 2024 19:25:37 +0000 (+0100)
Subject: move reade bytes per line in readinfo
X-Git-Tag: v1.0.0^2~292^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=1ce27d00af5eaa39f9b7b11717f9fc7d252c148d;p=sane-kds-s2000w-net.git

move reade bytes per line in readinfo
---

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index ff90fc3..6b3537d 100644
--- 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 d62977c..7e5c89f 100644
--- 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);