From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 11 Feb 2024 19:27:19 +0000 (+0100)
Subject: remove readed lines move to readinfo
X-Git-Tag: v1.0.0^2~292^2~1
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=51b9bf050ee2b3f9661f56ce349b3ea92d566339;p=sane-kds-s2000w-net.git

remove readed lines move to readinfo
---

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 6b3537d..5aa1597 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -26,8 +26,6 @@ readinfo* get_read_info()
 
 [[deprecated("use reade_info instead")]]
 metadata current_metadata;
-[[deprecated("use reade_info instead")]]
-int readed_lines = 0;
 
 [[deprecated("use reade_info instead")]]
 metadata* get_current_metadata()
@@ -35,12 +33,6 @@ metadata* get_current_metadata()
 	return &current_metadata;
 }
 
-[[deprecated("use reade_info instead")]]
-int* get_readed_lines()
-{
-	return &readed_lines;
-}
-
 int _sane_kds_s2000w_net_find_first_data_byte(const char* data)
 {
 	const int header_spaces = 3;
@@ -248,7 +240,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
 	params->lines = current_metadata.lines;
 	params->depth = current_metadata.depth;
 	read_info.read_size = 0;
-	readed_lines = 0;
+	read_info.readed_lines = 0;
 	read_info.readed_bytes_per_line = 0;
 
 	return SANE_STATUS_GOOD;
@@ -283,9 +275,9 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 	if (read_info.read_size <= 0)
 		read_info.read_size += skip_header_bytes;
 
-	if (readed_lines >= current_metadata.lines) {
+	if (read_info.readed_lines >= current_metadata.lines) {
 		*length = 0;
-		readed_lines = 0;
+		read_info.readed_lines = 0;
 		return SANE_STATUS_EOF;
 	}
 
@@ -301,7 +293,7 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 
 	if (read_info.readed_bytes_per_line >= current_metadata.bytes_per_line) {
 		read_info.readed_bytes_per_line = 0;
-		readed_lines++;
+		read_info.readed_lines++;
 	}
 
 	return SANE_STATUS_GOOD;
diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 7e5c89f..3928806 100644
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -59,8 +59,6 @@ START_TEST(sane_kds_s2000w_net_read_all_lines_test)
 	current_metadata_ptr->bytes_per_line = 10;
 	current_metadata_ptr->lines = 5;
 
-	int* readed_lines = get_readed_lines();
-	*readed_lines = 0;
 	int* length = malloc(sizeof(int));
 	*length = 0;