From 92ed96597534e18889f9b2ecc3a2154d4c09b37e Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 11 Feb 2024 20:19:42 +0100
Subject: [PATCH] remove read size use instead read info

---
 src/kds_s2000w_net.c         | 28 ++++++----------------------
 tests/kds_s2000w_net_tests.c | 21 ++++++++-------------
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 97ad293..f88b38d 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -8,11 +8,11 @@
 
 typedef struct {
 	int cancel;
-	metadata current_metadata;
 	int read_size;
 	int scan_started;
 	int readed_bytes_per_line;
 	int readed_lines;
+	metadata current_metadata;
 } readinfo;
 
 readinfo read_info;
@@ -24,13 +24,9 @@ readinfo* get_read_info()
 	return &read_info;
 }
 
-[[deprecated("use reade_info instead")]]
-int cancel = 0;
 [[deprecated("use reade_info instead")]]
 metadata current_metadata;
 [[deprecated("use reade_info instead")]]
-int read_size = 0;
-[[deprecated("use reade_info instead")]]
 int scan_started = 0;
 [[deprecated("use reade_info instead")]]
 int readed_bytes_per_line = 0;
@@ -43,18 +39,6 @@ metadata* get_current_metadata()
 	return &current_metadata;
 }
 
-[[deprecated("use reade_info instead")]]
-int* get_read_size()
-{
-	return &read_size;
-}
-
-[[deprecated("use reade_info instead")]]
-int* get_cancel()
-{
-	return &cancel;
-}
-
 [[deprecated("use reade_info instead")]]
 int* get_readed_lines()
 {
@@ -273,7 +257,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
 	params->pixels_per_line = current_metadata.pixels_per_line;
 	params->lines = current_metadata.lines;
 	params->depth = current_metadata.depth;
-	read_size = 0;
+	read_info.read_size = 0;
 	readed_lines = 0;
 	readed_bytes_per_line = 0;
 
@@ -306,8 +290,8 @@ 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)
-		read_size += skip_header_bytes;
+	if (read_info.read_size <= 0)
+		read_info.read_size += skip_header_bytes;
 
 	if (readed_lines >= current_metadata.lines) {
 		*length = 0;
@@ -320,10 +304,10 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 		maxlen = current_metadata.bytes_per_line - readed_bytes_per_line;
 
 	*length = maxlen;
-	memcpy(data, current_metadata.image + read_size, *length);
+	memcpy(data, current_metadata.image + read_info.read_size, *length);
 
 	readed_bytes_per_line += *length;
-	read_size += *length;
+	read_info.read_size += *length;
 
 	if (readed_bytes_per_line >= current_metadata.bytes_per_line) {
 		readed_bytes_per_line = 0;
diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 2311f03..d62977c 100644
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -49,8 +49,7 @@ START_TEST(sane_kds_s2000w_net_read_all_lines_test)
 	readinfo* read_info = get_read_info();
 	read_info->cancel = 0;
 	metadata* current_metadata_ptr = get_current_metadata();
-	int* read_size = get_read_size();
-	*read_size = 0;
+	read_info->read_size = 0;
 	char* image = malloc(sizeof(char) * 53);
 	for (int i = 0; i < 3; i++) {
 		image[i] = 0x0a;
@@ -74,7 +73,7 @@ START_TEST(sane_kds_s2000w_net_read_all_lines_test)
 	}
 
 	ck_assert_int_eq(status, SANE_STATUS_EOF);
-	ck_assert_int_eq(*read_size, 53);
+	ck_assert_int_eq(read_info->read_size, 53);
 
 	free(dataptr);
 	dataptr = NULL;
@@ -87,11 +86,9 @@ END_TEST
 
 START_TEST(sane_kds_s2000w_net_read_test)
 {
-	int* read_size_ptr = get_read_size();
-	*read_size_ptr = 0;
+	readinfo* read_info = get_read_info();
 	metadata* current_metadata_ptr = get_current_metadata();
-	int* read_size = get_read_size();
-	*read_size = 0;
+	read_info->read_size = 0;
 	current_metadata_ptr->lines = 1;
 	current_metadata_ptr->bytes_per_line = 65536;
 	char* image = malloc(sizeof(char) * 65539);
@@ -109,7 +106,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);
+	ck_assert_int_eq(read_info->read_size, 65539);
 
 	free(dataptr);
 	dataptr = NULL;
@@ -123,11 +120,9 @@ END_TEST
 
 START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
 {
-	int* read_size_ptr = get_read_size();
-	*read_size_ptr = 0;
+	readinfo* read_info = get_read_info();
+	read_info->read_size = 0;
 	metadata* current_metadata_ptr = get_current_metadata();
-	int* read_size = get_read_size();
-	*read_size = 0;
 	int* readed_bytes_per_line = get_readed_bytes_per_line();
 	readed_bytes_per_line = 0;
 	current_metadata_ptr->lines = 1;
@@ -146,7 +141,7 @@ START_TEST(sane_kds_s2000w_net_read_bytes_per_line_bigger_test)
 	_sane_kds_s2000w_net_read(NULL, (void*) dataptr, maxlen, length);
 	_sane_kds_s2000w_net_read(NULL, (void*) dataptr, maxlen, length);
 
-	ck_assert_int_eq(*read_size_ptr, 95003);	
+	ck_assert_int_eq(read_info->read_size, 95003);
 
 	free(dataptr);
 	dataptr = NULL;
-- 
2.39.5