From: Bastian Dehn <hhaalo@arcor.de>
Date: Mon, 19 Feb 2024 15:37:25 +0000 (+0100)
Subject: Revert "add verify metadata run two times"
X-Git-Tag: v1.0.0^2~229
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=992b0499c343286b89abb083b70f5c6622dd40a7;p=sane-kds-s2000w-net.git

Revert "add verify metadata run two times"

This reverts commit efe7ec138cf804b8d6b64eb6b42631e44d6c7334.
---

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index b4f0ca7..39f35a1 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -181,7 +181,6 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
 	h->current_metadata->depth = 0;
 	h->current_metadata->valid = 0;
 	h->current_metadata->scanned_all_complete = 0;
-	h->current_metadata->verify = 0;
 	h->current_metadata->image = NULL;
 	h->read_info = malloc(sizeof(readinfo));
 	h->read_info->scan_started = 0;
diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index e7db712..6f1798f 100644
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -21,7 +21,6 @@ typedef struct {
 	int depth;
 	int valid;
 	int scanned_all_complete;
-	int verify;
 	void* image;
 } metadata;
 
diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index f49f522..6b52d94 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -122,17 +122,11 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
 	if (!h->read_info->scan_started)
 		return SANE_STATUS_INVAL;
 
-	if (h->current_metadata->verify)
-		h->current_metadata->verify++;
-
-	if (!h->current_metadata->verify) {
-		for (int i = 0; i < 10; i++) {
-			sleep(1);
-			kds_s2000w_handler_get_parameters(handle);
-			h->current_metadata->verify = 1;
-			if (h->current_metadata->valid)
-				break;
-		}
+	for (int i = 0; i < 10; i++) {
+		sleep(1);
+		kds_s2000w_handler_get_parameters(handle);
+		if (h->current_metadata->valid)
+			break;
 	}
 
 	if (!h->current_metadata->valid)
@@ -151,9 +145,6 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
 	h->read_info->readed_bytes_per_line = 0;
 	h->read_info->readed_lines = 0;
 
-	if (h->current_metadata->verify >= 2)
-		h->current_metadata->verify = 0;
-
 	debug_printf_int(DEBUG, "format", params->format);
 	debug_printf_int(DEBUG, "last frame", params->last_frame);
 	debug_printf_int(DEBUG, "bytes per line", params->bytes_per_line);