change rename option descriptor get by number

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 7be04a24bb355f0ce7c140138618c414231fdd1d..be40a3e22c34677d5147f67b2b8ff46611da65e9 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -103,7 +103,7 @@ const SANE_Option_Descriptor* sane_kds_s2000w_net_get_option_descriptor(
 {
        kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_get_option_descriptor");
 
-       return kds_s2000w_option_descriptors_get(option);
+       return kds_s2000w_option_descriptors_get_by_number(option);
 }
 
 SANE_Status sane_kds_s2000w_net_control_option(SANE_Handle handle,

diff --git a/src/kds_s2000w_option_descriptors.c b/src/kds_s2000w_option_descriptors.c
index aab138432d2143354f0182204e42f6e432159fb3..dfcfde1691f81dd18a3b6e932502780902b75d32 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -1170,7 +1170,7 @@ void kds_s2000w_option_descriptors_free()
        SANE_Option_Descriptor* descriptor = NULL;
 
        for (int i = 0; i < MAX_OPTION_COUNT; i++) {
-               descriptor = kds_s2000w_option_descriptors_get(i);
+               descriptor = kds_s2000w_option_descriptors_get_by_number(i);
 
                if (descriptor->constraint_type == SANE_CONSTRAINT_STRING_LIST) {
                        free((void*) descriptor->constraint.string_list);
@@ -1192,14 +1192,14 @@ void kds_s2000w_option_descriptors_free()
        descriptor_array = NULL;
 }
 
-SANE_Option_Descriptor* kds_s2000w_option_descriptors_get(uint32_t option)
+SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_number(uint32_t number)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_get_descriptor");
 
-       if (option >= MAX_OPTION_COUNT)
+       if (number >= MAX_OPTION_COUNT)
                return NULL;
 
-       return &descriptor_array[option];
+       return &descriptor_array[number];
 }
 
 SANE_Option_Descriptor* kds_s2000w_option_descriptors_get_by_name(const char* name)

diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h
index b99e4abd628452bedb845941e2800d9bab7610ec..c91bc021146f0c57379a031a8b8b3f980ee9b748 100644 (file)
--- a/src/kds_s2000w_option_descriptors.h
+++ b/src/kds_s2000w_option_descriptors.h
@@ -6,7 +6,7 @@
 void kds_s2000w_option_descriptors_init();
 void kds_s2000w_option_descriptors_free();
 
-SANE_Option_Descriptor* kds_s2000w_option_descriptors_get(uint32_t option);
+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);
 
 #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 e6b4d32f3d45aa50ede866c8d6f86ffd109609d0..bc5abfd039a90d253d06856fd210fa53c65acd89 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -21,7 +21,7 @@ int teardown(void **state)
 
 void kds_s2000w_option_get_descriptor_zero_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(0);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(0);
 
        assert_string_equal(SANE_NAME_NUM_OPTIONS, option->name);
        assert_string_equal(SANE_TITLE_NUM_OPTIONS, option->title);
@@ -35,7 +35,7 @@ void kds_s2000w_option_get_descriptor_zero_test()
 
 void kds_s2000w_option_get_descriptor_one_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(1);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(1);
 
        assert_string_equal(SANE_NAME_STANDARD, option->name);
        assert_string_equal(SANE_TITLE_STANDARD, option->title);
@@ -49,7 +49,7 @@ void kds_s2000w_option_get_descriptor_one_test()
 
 void kds_s2000w_option_get_descriptor_two_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(2);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(2);
 
        assert_string_equal(SANE_NAME_SCAN_SOURCE, option->name);
        assert_string_equal(SANE_TITLE_SCAN_SOURCE, option->title);
@@ -67,7 +67,7 @@ void kds_s2000w_option_get_descriptor_two_test()
 
 void kds_s2000w_option_get_descriptor_three_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(3);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(3);
 
        assert_string_equal(SANE_NAME_SCAN_MODE, option->name);
        assert_string_equal(SANE_TITLE_SCAN_MODE, option->title);
@@ -85,7 +85,7 @@ void kds_s2000w_option_get_descriptor_three_test()
 
 void kds_s2000w_option_get_descriptor_four_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(4);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(4);
 
        assert_string_equal(SANE_NAME_SCAN_RESOLUTION, option->name);
        assert_string_equal(SANE_TITLE_SCAN_RESOLUTION, option->title);
@@ -105,7 +105,7 @@ void kds_s2000w_option_get_descriptor_four_test()
 
 void kds_s2000w_option_get_descriptor_five_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(5);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(5);
 
        assert_string_equal("scanside", option->name);
        assert_string_equal("Duplex Mode", option->title);
@@ -122,7 +122,7 @@ void kds_s2000w_option_get_descriptor_five_test()
 
 void kds_s2000w_option_get_descriptor_six_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(6);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(6);
 
        assert_string_equal(SANE_NAME_GEOMETRY, option->name);
        assert_string_equal(SANE_TITLE_GEOMETRY, option->title);
@@ -136,7 +136,7 @@ void kds_s2000w_option_get_descriptor_six_test()
 
 void kds_s2000w_option_get_descriptor_seven_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(7);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(7);
 
        assert_string_equal("cropping-mode", option->name);
        assert_string_equal("Cropping Mode", option->title);
@@ -155,7 +155,7 @@ void kds_s2000w_option_get_descriptor_seven_test()
 
 void kds_s2000w_option_get_descriptor_eight_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(8);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(8);
 
        assert_string_equal("cropping-image", option->name);
        assert_string_equal("Cropping Image", option->title);
@@ -172,7 +172,7 @@ void kds_s2000w_option_get_descriptor_eight_test()
 
 void kds_s2000w_option_get_descriptor_nine_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(9);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(9);
 
        assert_string_equal("image-offset-x", option->name);
        assert_string_equal("Image Offset X", option->title);
@@ -189,7 +189,7 @@ void kds_s2000w_option_get_descriptor_nine_test()
 
 void kds_s2000w_option_get_descriptor_ten_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(10);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(10);
 
        assert_string_equal("image-offset-y", option->name);
        assert_string_equal("Image Offset Y", option->title);
@@ -206,7 +206,7 @@ void kds_s2000w_option_get_descriptor_ten_test()
 
 void kds_s2000w_option_get_descriptor_eleven_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(11);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(11);
 
        assert_string_equal("image-width", option->name);
        assert_string_equal("Image Width", option->title);
@@ -223,7 +223,7 @@ void kds_s2000w_option_get_descriptor_eleven_test()
 
 void kds_s2000w_option_get_descriptor_twelve_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(12);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(12);
 
        assert_string_equal("image-height", option->name);
        assert_string_equal("Image Height", option->title);
@@ -240,7 +240,7 @@ void kds_s2000w_option_get_descriptor_twelve_test()
 
 void kds_s2000w_option_get_descriptor_thirdteen_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(13);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(13);
 
        assert_string_equal("boldness-smoothing", option->name);
        assert_string_equal("Boldness / Smoothing Options", option->title);
@@ -254,7 +254,7 @@ void kds_s2000w_option_get_descriptor_thirdteen_test()
 
 void kds_s2000w_option_get_descriptor_fourteen_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(14);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(14);
 
        assert_string_equal("foreground-boldness-mode", option->name);
        assert_string_equal("Foreground Boldness Mode", option->title);
@@ -272,7 +272,7 @@ void kds_s2000w_option_get_descriptor_fourteen_test()
 
 void kds_s2000w_option_get_descriptor_fifteen_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(15);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(15);
 
        assert_string_equal("foreground-boldness-aggressiveness", option->name);
        assert_string_equal("Foreground Boldness Aggressiveness", option->title);
@@ -289,7 +289,7 @@ void kds_s2000w_option_get_descriptor_fifteen_test()
 
 void kds_s2000w_option_get_descriptor_sixteen_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(16);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(16);
 
        assert_string_equal("background-smoothing-mode", option->name);
        assert_string_equal("Background Smoothing Mode", option->title);
@@ -307,7 +307,7 @@ void kds_s2000w_option_get_descriptor_sixteen_test()
 
 void kds_s2000w_option_get_descriptor_seventeen_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(17);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(17);
 
        assert_string_equal("background-smoothing-aggressiveness", option->name);
        assert_string_equal("Background Smoothing Aggressiveness", option->title);
@@ -324,7 +324,7 @@ void kds_s2000w_option_get_descriptor_seventeen_test()
 
 void kds_s2000w_option_get_descriptor_eightteen_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(18);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(18);
 
        assert_string_equal("color-options", option->name);
        assert_string_equal("Color Options", option->title);
@@ -338,7 +338,7 @@ void kds_s2000w_option_get_descriptor_eightteen_test()
 
 void kds_s2000w_option_get_descriptor_nineteen_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(19);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(19);
 
        assert_string_equal("color-drop-out", option->name);
        assert_string_equal("Color Drop Out", option->title);
@@ -361,7 +361,7 @@ void kds_s2000w_option_get_descriptor_nineteen_test()
 
 void kds_s2000w_option_get_descriptor_twenty_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(20);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(20);
 
        assert_string_equal("color-drop-out-aggressiveness", option->name);
        assert_string_equal("Color Drop Out Aggressiveness", option->title);
@@ -378,7 +378,7 @@ void kds_s2000w_option_get_descriptor_twenty_test()
 
 void kds_s2000w_option_get_descriptor_twentyone_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(21);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(21);
 
        assert_string_equal("color-auto-brightness-mode", option->name);
        assert_string_equal("Color Auto Brightness Mode", option->title);
@@ -396,7 +396,7 @@ void kds_s2000w_option_get_descriptor_twentyone_test()
 
 void kds_s2000w_option_get_descriptor_twentytwo_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(22);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(22);
 
        assert_string_equal("color-brightness", option->name);
        assert_string_equal("Color Brightness", option->title);
@@ -413,7 +413,7 @@ void kds_s2000w_option_get_descriptor_twentytwo_test()
 
 void kds_s2000w_option_get_descriptor_twentythree_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(23);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(23);
 
        assert_string_equal("color-contrast", option->name);
        assert_string_equal("Color Contrast", option->title);
@@ -430,7 +430,7 @@ void kds_s2000w_option_get_descriptor_twentythree_test()
 
 void kds_s2000w_option_get_descriptor_twentyfour_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(24);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(24);
 
        assert_string_equal("color-balance-mode", option->name);
        assert_string_equal("Color Balance Mode", option->title);
@@ -449,7 +449,7 @@ void kds_s2000w_option_get_descriptor_twentyfour_test()
 
 void kds_s2000w_option_get_descriptor_twentyfive_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(25);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(25);
 
        assert_string_equal("color-balance-aggressiveness", option->name);
        assert_string_equal("Color Balance Aggressiveness", option->title);
@@ -466,7 +466,7 @@ void kds_s2000w_option_get_descriptor_twentyfive_test()
 
 void kds_s2000w_option_get_descriptor_twentysix_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(26);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(26);
 
        assert_string_equal("color-balance-red", option->name);
        assert_string_equal("Color Balance Red", option->title);
@@ -483,7 +483,7 @@ void kds_s2000w_option_get_descriptor_twentysix_test()
 
 void kds_s2000w_option_get_descriptor_twentyseven_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(27);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(27);
 
        assert_string_equal("color-balance-green", option->name);
        assert_string_equal("Color Balance Green", option->title);
@@ -500,7 +500,7 @@ void kds_s2000w_option_get_descriptor_twentyseven_test()
 
 void kds_s2000w_option_get_descriptor_twentyeight_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(28);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(28);
 
        assert_string_equal("color-balance-blue", option->name);
        assert_string_equal("Color Balance Blue", option->title);
@@ -517,7 +517,7 @@ void kds_s2000w_option_get_descriptor_twentyeight_test()
 
 void kds_s2000w_option_get_descriptor_twentynine_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(29);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(29);
 
        assert_string_equal("color-sharpen", option->name);
        assert_string_equal("Color Sharpen", option->title);
@@ -536,7 +536,7 @@ void kds_s2000w_option_get_descriptor_twentynine_test()
 
 void kds_s2000w_option_get_descriptor_thirdy_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(30);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(30);
 
        assert_string_equal("binarization-contrast", option->name);
        assert_string_equal("Binarization Contrast", option->title);
@@ -553,7 +553,7 @@ void kds_s2000w_option_get_descriptor_thirdy_test()
 
 void kds_s2000w_option_get_descriptor_thirdyone_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(31);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(31);
 
        assert_string_equal("config-reset", option->name);
        assert_string_equal("Reset Config", option->title);
@@ -567,7 +567,7 @@ void kds_s2000w_option_get_descriptor_thirdyone_test()
 
 void kds_s2000w_option_get_descriptor_thirdytwo_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(32);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(32);
 
        assert_string_equal("image-processing-options", option->name);
        assert_string_equal("Image Processing Options", option->title);
@@ -581,7 +581,7 @@ void kds_s2000w_option_get_descriptor_thirdytwo_test()
 
 void kds_s2000w_option_get_descriptor_thirdythree_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(33);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(33);
 
        assert_string_equal("skip-blank-pages", option->name);
        assert_string_equal("Blank Blank Pages", option->title);
@@ -595,7 +595,7 @@ void kds_s2000w_option_get_descriptor_thirdythree_test()
 
 void kds_s2000w_option_get_descriptor_thirdyfour_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(34);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(34);
 
        assert_string_equal("skip-blank-page-content", option->name);
        assert_string_equal("Skip Blank Page Content", option->title);
@@ -612,7 +612,7 @@ void kds_s2000w_option_get_descriptor_thirdyfour_test()
 
 void kds_s2000w_option_get_descriptor_thirdyfive_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(35);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(35);
 
        assert_string_equal("hole-fill", option->name);
        assert_string_equal("Hole Fill", option->title);
@@ -626,7 +626,7 @@ void kds_s2000w_option_get_descriptor_thirdyfive_test()
 
 void kds_s2000w_option_get_descriptor_thirdysix_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(36);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(36);
 
        assert_string_equal("post-scan-rotation", option->name);
        assert_string_equal("Post Scan Rotation", option->title);
@@ -646,7 +646,7 @@ void kds_s2000w_option_get_descriptor_thirdysix_test()
 
 void kds_s2000w_option_get_descriptor_thirdyseven_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(37);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(37);
 
        assert_string_equal("edge-fill", option->name);
        assert_string_equal("Edge Fill", option->title);
@@ -664,7 +664,7 @@ void kds_s2000w_option_get_descriptor_thirdyseven_test()
 
 void kds_s2000w_option_get_descriptor_thirdyeight_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(38);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(38);
 
        assert_string_equal("image-border", option->name);
        assert_string_equal("Image Border", option->title);
@@ -682,7 +682,7 @@ void kds_s2000w_option_get_descriptor_thirdyeight_test()
 
 void kds_s2000w_option_get_descriptor_thirdynine_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(39);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(39);
 
        assert_string_equal("jpeg-quality", option->name);
        assert_string_equal("Jpeg Quality", option->title);
@@ -702,7 +702,7 @@ void kds_s2000w_option_get_descriptor_thirdynine_test()
 
 void kds_s2000w_option_get_descriptor_fourty_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(40);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(40);
 
        assert_string_equal("feeder-options", option->name);
        assert_string_equal("Feeder Options", option->title);
@@ -716,7 +716,7 @@ void kds_s2000w_option_get_descriptor_fourty_test()
 
 void kds_s2000w_option_get_descriptor_fourtyone_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(41);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(41);
 
 
        assert_string_equal("max-document-length", option->name);
@@ -734,7 +734,7 @@ void kds_s2000w_option_get_descriptor_fourtyone_test()
 
 void kds_s2000w_option_get_descriptor_fourtytwo_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(42);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(42);
 
        assert_string_equal("transport-handling", option->name);
        assert_string_equal("Transport Handling", option->title);
@@ -753,7 +753,7 @@ void kds_s2000w_option_get_descriptor_fourtytwo_test()
 
 void kds_s2000w_option_get_descriptor_fourtythree_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(43);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(43);
 
        assert_string_equal("multifeed-sensitivity", option->name);
        assert_string_equal("Multifeed Sensitivity", option->title);
@@ -772,7 +772,7 @@ void kds_s2000w_option_get_descriptor_fourtythree_test()
 
 void kds_s2000w_option_get_descriptor_fourtyfour_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(44);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(44);
 
        assert_string_equal("multifeed-response", option->name);
        assert_string_equal("Multifeed Response", option->title);
@@ -789,7 +789,7 @@ void kds_s2000w_option_get_descriptor_fourtyfour_test()
 
 void kds_s2000w_option_get_descriptor_fourtyfive_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(45);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(45);
 
        assert_string_equal("document-feeder-timeout", option->name);
        assert_string_equal("Document Feeder Timeout", option->title);
@@ -806,7 +806,7 @@ void kds_s2000w_option_get_descriptor_fourtyfive_test()
 
 void kds_s2000w_option_get_descriptor_fourtysix_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(46);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(46);
 
        assert_string_equal("document-feeder-timeout-response", option->name);
        assert_string_equal("Document Feeder Timeout Response", option->title);
@@ -831,7 +831,7 @@ void kds_s2000w_option_get_descriptor_get_by_name_test()
 
 void kds_s2000w_option_get_descriptor_over_max_options_test()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(MAX_OPTION_COUNT);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get_by_number(MAX_OPTION_COUNT);
 
        assert_null(option);
 }
\ No newline at end of file