From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 17 Oct 2025 15:42:28 +0000 (+0200)
Subject: change rename scan status completed
X-Git-Tag: v1.1.14^2~21
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=28ee8a4a42d0d8f75d046c882110b01bc3cf1951;p=sane-kds-s2000w-net.git

change rename scan status completed
---

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index bfc80d5..2234fa2 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -111,7 +111,7 @@ handler* kds_s2000w_handler_init()
 	h->scan_status->current_image_number = 1;
 	h->scan_status->available_images = 0;
 	h->scan_status->downloaded_images = 0;
-	h->scan_status->complete_scanned = false;
+	h->scan_status->completed = false;
 	h->read_info->scan_started = false;
 	h->read_info->cancel = false;
 	h->read_info->read_size = 0;
@@ -160,7 +160,7 @@ void kds_s2000w_handler_reset(handler* h)
 	h->scan_status->current_image_number = 1;
 	h->scan_status->available_images = 0;
 	h->scan_status->downloaded_images = 0;
-	h->scan_status->complete_scanned = false;
+	h->scan_status->completed = false;
 	h->read_info->scan_started = false;
 	h->read_info->cancel = false;
 	h->read_info->read_size = 0;
@@ -384,7 +384,7 @@ void kds_s2000w_handler_get_current_scan_status(handler* h)
 	status_value_obj = json_object_object_get(status_obj, "State");
 	const char* scanner_state = json_object_get_string(status_value_obj);
 	if (strcmp(scanner_state, "Scanning") != 0)
-		h->scan_status->complete_scanned = true;
+		h->scan_status->completed = true;
 
 	json_object_put(status_resp_obj);
 	status_resp_obj = NULL;
diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index dc450eb..7d5d49f 100644
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -46,7 +46,7 @@ typedef struct {
 	uint8_t current_image_number;
 	uint8_t available_images;
 	uint8_t downloaded_images;
-	bool complete_scanned;
+	bool completed;
 } scan_status_t;
 
 typedef struct {
diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 256faa0..1cfd67c 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -178,7 +178,7 @@ SANE_Status sane_kds_s2000w_net_start(SANE_Handle handle)
 	kds_s2000w_handler_delete_current_image(h);
 	h->scan_status->current_image_number++;
 
-	if (h->scan_status->complete_scanned) {
+	if (h->scan_status->completed) {
 		kds_s2000w_handler_stop_scan(h);
 		return SANE_STATUS_GOOD;
 	}
@@ -228,7 +228,7 @@ void sane_kds_s2000w_net_cancel(SANE_Handle handle)
 
 	kds_s2000w_handler_get_current_scan_status(h);
 
-	if (h->scan_status->complete_scanned) {
+	if (h->scan_status->completed) {
 		kds_s2000w_debug_printf(DEBUG, "scan completed");
 		kds_s2000w_handler_reset(h);
 		return;
diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 53744d3..fe602af 100644
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -358,7 +358,7 @@ void sane_kds_s2000w_net_start_test(void** state)
 	int result = sane_kds_s2000w_net_start(h);
 
 	assert_int_equal(result, SANE_STATUS_GOOD);
-	assert_false(h->scan_status->complete_scanned);
+	assert_false(h->scan_status->completed);
 
 	json_object_put(h->current_scanner_config);
 	h->current_scanner_config = NULL;
@@ -403,7 +403,7 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state)
 	int result = sane_kds_s2000w_net_start(h);
 
 	assert_int_equal(result, SANE_STATUS_GOOD);
-	assert_false(h->scan_status->complete_scanned);
+	assert_false(h->scan_status->completed);
 
 	json_object_put(h->current_scanner_config);
 	h->current_scanner_config = NULL;
@@ -450,7 +450,7 @@ void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state)
 	int result = sane_kds_s2000w_net_start(h);
 
 	assert_int_equal(result, SANE_STATUS_GOOD);
-	assert_true(h->scan_status->complete_scanned);
+	assert_true(h->scan_status->completed);
 
 	json_object_put(h->current_scanner_config);
 	h->current_scanner_config = NULL;
@@ -526,7 +526,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
 	int32_t result = sane_kds_s2000w_net_start(h);
 
 	assert_int_equal(result, SANE_STATUS_GOOD);
-	assert_true(h->scan_status->complete_scanned);
+	assert_true(h->scan_status->completed);
 
 	json_object_put(h->current_scanner_config);
 	h->current_scanner_config = NULL;
@@ -648,7 +648,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder_test()
 	sane_kds_s2000w_net_cancel(h);
 
 	assert_false(h->read_info->cancel);
-	assert_false(h->scan_status->complete_scanned);
+	assert_false(h->scan_status->completed);
 
 	kds_s2000w_client_response_free(resp_status);
 	resp_status = NULL;
@@ -698,7 +698,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test()
 	sane_kds_s2000w_net_cancel(h);
 
 	assert_false(h->read_info->cancel);
-	assert_false(h->scan_status->complete_scanned);
+	assert_false(h->scan_status->completed);
 
 	kds_s2000w_client_response_free(resp_status);
 	resp_status = NULL;