From 172c0f043ad41f814ce483442940c1f5f46dc599 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sun, 18 Feb 2024 12:27:00 +0100 Subject: [PATCH] Revert "remove return current metadata" This reverts commit f1300dbd89af108e82d599de0d555d757858b518. --- src/kds_s2000w_handler.c | 8 +++++--- src/kds_s2000w_handler.h | 2 +- src/kds_s2000w_net.c | 2 +- tests/kds_s2000w_net_get_params_tests.c | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 889e588..df94015 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -278,7 +278,7 @@ void kds_s2000w_handler_stop_scan(void* handle) resp = NULL; } -void kds_s2000w_handler_get_parameters(void* handle) +metadata kds_s2000w_handler_get_parameters(void* handle) { debug_printf(ALL, "kds_s2000w_handler_get_parameters"); handler* h = (handler*) handle; @@ -292,16 +292,18 @@ void kds_s2000w_handler_get_parameters(void* handle) h->read_info.current_metadata.valid = 1; h->read_info.current_metadata.scanned_all_complete = 1; h->read_info.current_metadata.is_last = 1; - return; + return h->read_info.current_metadata; } if (h->current_scan_status.downloaded_images >= h->current_scan_status.available_images) { h->read_info.current_metadata.valid = 0; - return; + return h->read_info.current_metadata; } _download_current_image(h); _get_current_metadata(h); _delete_current_image(h); h->current_scan_status.current_image_number++; + + return h->read_info.current_metadata; } \ No newline at end of file diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h index 7526b1c..4d8bf8c 100644 --- a/src/kds_s2000w_handler.h +++ b/src/kds_s2000w_handler.h @@ -54,5 +54,5 @@ void kds_s2000w_handler_set_option(void* handle, int option, void* value, int* i void kds_s2000w_handler_set_option_auto(int option); void kds_s2000w_handler_start_scan(void* handle); void kds_s2000w_handler_stop_scan(void* handle); -void kds_s2000w_handler_get_parameters(void* handle); +metadata kds_s2000w_handler_get_parameters(void* handle); #endif \ No newline at end of file diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index bf24a5d..9955aa0 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -124,7 +124,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle, for (int i = 0; i < 10; i++) { sleep(1); - kds_s2000w_handler_get_parameters(handle); + h->read_info.current_metadata = kds_s2000w_handler_get_parameters(handle); if (h->read_info.current_metadata.valid) break; } diff --git a/tests/kds_s2000w_net_get_params_tests.c b/tests/kds_s2000w_net_get_params_tests.c index 95e77bb..1996e54 100644 --- a/tests/kds_s2000w_net_get_params_tests.c +++ b/tests/kds_s2000w_net_get_params_tests.c @@ -6,7 +6,7 @@ START_TEST(kds_s2000w_net_get_parameters_invalid_metdata) { handler h; h.read_info.scan_started = 1; - h.read_info.current_metadata.valid = 0; + mdata.valid = 0; SANE_Parameters* params = malloc(sizeof(SANE_Parameters)); SANE_Status status = _sane_kds_s2000w_net_get_parameters(&h, params); -- 2.39.5