change descriptor method prefix

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index dfec6f0f9b77f7b2721720bbe83cf68877da5ba2..8ea46f0b6ef33203e3ef6867b998b6337c5c1fe1 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -339,7 +339,7 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value
        if (h->current_scanner_config != NULL)
                config = json_object_object_get(h->current_scanner_config, "Configuration");
 
-       option_descriptor* descriptor = kds_s2000w_option_descriptor_full_get_by_number(option);
+       option_descriptor* descriptor = kds_s2000w_option_descriptors_full_get_by_number(option);
        json_object* value_object = NULL;
        if (strcmp(descriptor->config_name, OPTION_COUNT) == 0) {
                config = json_object_object_get(h->current_scanner_config, "Configuration");
@@ -383,7 +383,7 @@ void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value
        if (h->current_scanner_config != NULL)
                config = json_object_object_get(h->current_scanner_config, "Configuration");
 
-       option_descriptor* descriptor = kds_s2000w_option_descriptor_full_get_by_number(option);
+       option_descriptor* descriptor = kds_s2000w_option_descriptors_full_get_by_number(option);
        json_object* value_object = NULL;
 
        value_object = json_object_object_get(config, descriptor->config_name);

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index 699d48f621baabbf37d60e7b2b59aae9d9a150cb..fcc879205dd5fc9d41d3e8d5b116dc13d1a7793b 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1417,7 +1417,7 @@ uint8_t kds_s2000w_option_descriptors_get_max_option_count()
        return max_option_count;
 }
 
-option_descriptor* kds_s2000w_option_descriptor_full_get_by_number(uint32_t number)
+option_descriptor* kds_s2000w_option_descriptors_full_get_by_number(uint32_t number)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_full_get_by_number");
 

diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h
index 9479674d2dd81cd57b8750ce853d80a5c8f3616a..846d1d33ccb62e65a8aecf3b644e375696a9350e 100644 (file)
--- a/src/kds_s2000w_option_descriptors.h
+++ b/src/kds_s2000w_option_descriptors.h
@@ -73,7 +73,7 @@ void kds_s2000w_option_descriptors_init(uint8_t profile);
 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);
+option_descriptor* kds_s2000w_option_descriptors_full_get_by_number(uint32_t number);
 SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_number(uint32_t number);
 __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);

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 252138372e20ebb4d2ec603bb038062b6d576b82..315aaa9afcf9659b94c52ea14a880f931e2c418c 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -851,7 +851,7 @@ void kds_s2000w_option_get_descriptor_over_max_options_test()
 
 void kds_s2000w_option_full_get_descriptor_by_number()
 {
-       option_descriptor* option = kds_s2000w_option_descriptor_full_get_by_number(31);
+       option_descriptor* option = kds_s2000w_option_descriptors_full_get_by_number(31);
 
        assert_string_equal(option->config_name, "Reset");
 }
@@ -860,7 +860,7 @@ void kds_s2000w_option_full_get_descriptor_over_max_options_test()
 {
        uint8_t max_option_count = kds_s2000w_option_descriptors_get_max_option_count();
 
-       option_descriptor* option = kds_s2000w_option_descriptor_full_get_by_number(max_option_count);
+       option_descriptor* option = kds_s2000w_option_descriptors_full_get_by_number(max_option_count);
 
        assert_null(option);
 }
\ No newline at end of file