From: Bastian Dehn Date: Wed, 1 Oct 2025 18:53:36 +0000 (+0200) Subject: change get option descriptor per config name X-Git-Tag: v1.1.9^2~5 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=9dd2314a7089c85eb43cb734680f311af4cfddf4;p=sane-kds-s2000w-net.git change get option descriptor per config name --- diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 4ee55a0..dfec6f0 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -103,7 +103,7 @@ void _kds_s2000w_handler_opts_set_enable_cropping_image(json_object* config) const char* cropping_mode_value = json_object_get_string(cropping_mode); json_object* cropping_image = json_object_object_get(config, CROPPING_IMAGE); - SANE_Option_Descriptor* cropping_image_descriptor = kds_s2000w_option_descriptors_get_by_name("cropping-image"); + SANE_Option_Descriptor* cropping_image_descriptor = kds_s2000w_option_descriptors_get_by_config_name(CROPPING_IMAGE); if (strcmp(cropping_mode_value, "Automatic") == 0) { _kds_s2000w_handler_opts_write_value_to_json(cropping_image, cropping_image_descriptor->type, "EntireDocument"); @@ -125,10 +125,10 @@ void _kds_s2000w_handler_opts_set_enable_suboptions_cropping_image(json_object* json_object* cropping_image = json_object_object_get(config, CROPPING_IMAGE);; const char* cropping_image_value = json_object_get_string(cropping_image); - SANE_Option_Descriptor* image_offset_x = kds_s2000w_option_descriptors_get_by_name("image-offset-x"); - SANE_Option_Descriptor* image_offset_y = kds_s2000w_option_descriptors_get_by_name("image-offset-y"); - SANE_Option_Descriptor* image_width = kds_s2000w_option_descriptors_get_by_name("image-width"); - SANE_Option_Descriptor* image_height = kds_s2000w_option_descriptors_get_by_name("image-height"); + SANE_Option_Descriptor* image_offset_x = kds_s2000w_option_descriptors_get_by_config_name(IMAGE_OFFSET_X); + SANE_Option_Descriptor* image_offset_y = kds_s2000w_option_descriptors_get_by_config_name(IMAGE_OFFSET_Y); + SANE_Option_Descriptor* image_width = kds_s2000w_option_descriptors_get_by_config_name(IMAGE_WIDTH); + SANE_Option_Descriptor* image_height = kds_s2000w_option_descriptors_get_by_config_name(IMAGE_HEIGHT); if (strcmp(cropping_image_value, "PartialDocument") == 0) { image_offset_x->cap |= SANE_CAP_SOFT_SELECT; @@ -149,9 +149,9 @@ void _kds_s2000w_handler_opts_set_enable_color_balance(json_object* config) json_object* color_balance_mode = json_object_object_get(config, COLOR_BALANCE_MODE);; const char* color_balance_mode_value = json_object_get_string(color_balance_mode); - SANE_Option_Descriptor* color_balance_red = kds_s2000w_option_descriptors_get_by_name("color-balance-red"); - SANE_Option_Descriptor* color_balance_green = kds_s2000w_option_descriptors_get_by_name("color-balance-green"); - SANE_Option_Descriptor* color_balance_blue = kds_s2000w_option_descriptors_get_by_name("color-balance-blue"); + SANE_Option_Descriptor* color_balance_red = kds_s2000w_option_descriptors_get_by_config_name(COLOR_BALANCE_RED); + SANE_Option_Descriptor* color_balance_green = kds_s2000w_option_descriptors_get_by_config_name(COLOR_BALANCE_GREEN); + SANE_Option_Descriptor* color_balance_blue = kds_s2000w_option_descriptors_get_by_config_name(COLOR_BALANCE_BLUE); if (strcmp(color_balance_mode_value, "Manual") == 0) { color_balance_red->cap |= SANE_CAP_SOFT_SELECT; @@ -170,7 +170,7 @@ void _kds_s2000w_handler_opts_set_enable_color_aggressiveness(json_object* confi json_object* color_balance_mode = json_object_object_get(config, COLOR_BALANCE_MODE);; const char* color_balance_mode_value = json_object_get_string(color_balance_mode); - SANE_Option_Descriptor* color_balance_aggressivness = kds_s2000w_option_descriptors_get_by_name("color-balance-aggressiveness"); + SANE_Option_Descriptor* color_balance_aggressivness = kds_s2000w_option_descriptors_get_by_config_name(COLOR_BALANCE_AGGRESSIVENESS); if (strcmp(color_balance_mode_value, "AutomaticAdvanced") == 0) { color_balance_aggressivness->cap |= SANE_CAP_SOFT_SELECT; @@ -185,7 +185,7 @@ void _kds_s2000w_handler_opts_set_enable_color_brightness(json_object* config) json_object* color_auto_brightness_mode = json_object_object_get(config, COLOR_AUTO_BRIGHTNESS_MODE);; const char* color_auto_brightness_mode_value = json_object_get_string(color_auto_brightness_mode); - SANE_Option_Descriptor* color_brightness = kds_s2000w_option_descriptors_get_by_name("color-brightness"); + SANE_Option_Descriptor* color_brightness = kds_s2000w_option_descriptors_get_by_config_name(COLOR_BRIGHTNESS); if (strcmp(color_auto_brightness_mode_value, "Manual") == 0) { color_brightness->cap |= SANE_CAP_SOFT_SELECT; @@ -200,7 +200,7 @@ void _kds_s2000w_handler_opts_set_enable_color_contrast(json_object* config) json_object* color_auto_brightness_mode = json_object_object_get(config, COLOR_AUTO_BRIGHTNESS_MODE);; const char* color_auto_brightness_mode_value = json_object_get_string(color_auto_brightness_mode); - SANE_Option_Descriptor* color_constrast = kds_s2000w_option_descriptors_get_by_name("color-contrast"); + SANE_Option_Descriptor* color_constrast = kds_s2000w_option_descriptors_get_by_config_name(COLOR_CONTRAST); if (strcmp(color_auto_brightness_mode_value, "Manual") == 0) { color_constrast->cap |= SANE_CAP_SOFT_SELECT; @@ -215,7 +215,7 @@ void _kds_s2000w_handler_opts_set_enable_boldness_aggressiveness(json_object* co json_object* foreground_boldness_mode = json_object_object_get(config, FOREGROUND_BOLDNESS_MODE);; const char* foreground_boldness_mode_value = json_object_get_string(foreground_boldness_mode); - SANE_Option_Descriptor* foreground_boldness_aggressiveness = kds_s2000w_option_descriptors_get_by_name("foreground-boldness-aggressiveness"); + SANE_Option_Descriptor* foreground_boldness_aggressiveness = kds_s2000w_option_descriptors_get_by_config_name(FOREGROUND_BOLDNESS_AGGRESSIVENESS); if (strcmp(foreground_boldness_mode_value, "AutomaticAdvanced") == 0) { foreground_boldness_aggressiveness->cap |= SANE_CAP_SOFT_SELECT; @@ -230,7 +230,7 @@ void _kds_s2000w_handler_opts_set_enable_smoothing_aggressiveness(json_object* c json_object* background_smoothing_mode = json_object_object_get(config, BACKGROUND_SMOOTHING_MODE);; const char* background_smoothing_mode_value = json_object_get_string(background_smoothing_mode); - SANE_Option_Descriptor* background_smoothing_aggressiveness = kds_s2000w_option_descriptors_get_by_name("background-smoothing-aggressiveness"); + SANE_Option_Descriptor* background_smoothing_aggressiveness = kds_s2000w_option_descriptors_get_by_config_name(BACKGROUND_SMOOTHING_AGGRESSIVENESS); if (strcmp(background_smoothing_mode_value, "AutomaticAdvanced") == 0) { background_smoothing_aggressiveness->cap |= SANE_CAP_SOFT_SELECT; @@ -245,7 +245,7 @@ void _kds_s2000w_handler_opts_set_enable_color_drop_out_aggressiveness(json_obje json_object* color_drop_out = json_object_object_get(config, COLOR_DROP_OUT);; const char* color_drop_out_value = json_object_get_string(color_drop_out); - SANE_Option_Descriptor* color_drop_out_aggressiveness = kds_s2000w_option_descriptors_get_by_name("color-drop-out-aggressiveness"); + SANE_Option_Descriptor* color_drop_out_aggressiveness = kds_s2000w_option_descriptors_get_by_config_name(COLOR_DROP_OUT_AGGRESSIVENESS); if (strcmp(color_drop_out_value, "Predominant") == 0 || strcmp(color_drop_out_value, "Multiple") == 0) { color_drop_out_aggressiveness->cap |= SANE_CAP_SOFT_SELECT; diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c index 8849fab..699d48f 100644 --- a/src/kds_s2000w_option_descriptors.c +++ b/src/kds_s2000w_option_descriptors.c @@ -1437,12 +1437,12 @@ SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_number(uint32_t num return descriptors[number]->descriptor; } -SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_name(const char* name) +SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_config_name(const char* name) { - kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_get_by_name"); + kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptors_get_by_config_name"); for (int i = 0; i < max_option_count; i++) { - if (strcmp(descriptors[i]->descriptor->name, name) == 0) + if (strcmp(descriptors[i]->config_name, name) == 0) return descriptors[i]->descriptor; } diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h index ecdc92b..9479674 100644 --- a/src/kds_s2000w_option_descriptors.h +++ b/src/kds_s2000w_option_descriptors.h @@ -75,6 +75,7 @@ void kds_s2000w_option_descriptors_free(); uint8_t kds_s2000w_option_descriptors_get_max_option_count(); option_descriptor* kds_s2000w_option_descriptor_full_get_by_number(uint32_t number); SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_number(uint32_t number); -SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_name(const char* name); +__attribute_deprecated__ SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_name(const char* name); +SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_config_name(const char* name); #endif \ No newline at end of file diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c index 1935f15..2521383 100644 --- a/tests/kds_s2000w_option_descriptor_tests.c +++ b/tests/kds_s2000w_option_descriptor_tests.c @@ -833,9 +833,9 @@ void kds_s2000w_option_get_descriptor_fourtyseven_test() assert_null(option->constraint.string_list[3]); } -void kds_s2000w_option_get_descriptor_get_by_name_test() +void kds_s2000w_option_get_descriptor_get_by_config_name_test() { - SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_name("config-reset"); + SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_config_name(RESET); assert_string_equal(option->name, "config-reset"); } diff --git a/tests/kds_s2000w_option_descriptor_tests.h b/tests/kds_s2000w_option_descriptor_tests.h index 4748008..7ce502e 100644 --- a/tests/kds_s2000w_option_descriptor_tests.h +++ b/tests/kds_s2000w_option_descriptor_tests.h @@ -56,7 +56,7 @@ void kds_s2000w_option_get_descriptor_fourtyfour_test(); void kds_s2000w_option_get_descriptor_fourtyfive_test(); void kds_s2000w_option_get_descriptor_fourtysix_test(); void kds_s2000w_option_get_descriptor_fourtyseven_test(); -void kds_s2000w_option_get_descriptor_get_by_name_test(); +void kds_s2000w_option_get_descriptor_get_by_config_name_test(); void kds_s2000w_option_get_descriptor_over_max_options_test(); void kds_s2000w_option_full_get_descriptor_by_number(); void kds_s2000w_option_full_get_descriptor_over_max_options_test(); diff --git a/tests/kds_s2000w_option_descriptor_tests_run.c b/tests/kds_s2000w_option_descriptor_tests_run.c index 988fc0e..e6d72e3 100644 --- a/tests/kds_s2000w_option_descriptor_tests_run.c +++ b/tests/kds_s2000w_option_descriptor_tests_run.c @@ -51,7 +51,7 @@ int main() cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfive_test, setup, teardown), cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtysix_test, setup, teardown), cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyseven_test, setup, teardown), - cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_get_by_name_test, setup, teardown), + cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_get_by_config_name_test, setup, teardown), cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown), cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_by_number, setup, teardown), cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_over_max_options_test, setup, teardown),