change naming option descriptors

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index be26aa30403541f37965acaf2c9ec039924cc1b1..aa4f9487541067f281979558595198b71911d867 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -70,7 +70,7 @@ SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename,
                return SANE_STATUS_DEVICE_BUSY;
        }
 
-       kds_s2000w_option_descriptor_init_option_descriptors();
+       kds_s2000w_option_descriptors_init();
        return SANE_STATUS_GOOD;
 }
 
@@ -82,7 +82,7 @@ void sane_kds_s2000w_net_close(SANE_Handle handle)
        if (h == NULL || h->state != OPENED)
                return;
 
-       kds_s2000w_option_descriptor_free_option_descriptors();
+       kds_s2000w_option_descriptors_free();
        kds_s2000w_handler_close(handle);
 }
 
@@ -91,7 +91,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_get_descriptor(option);
+       return kds_s2000w_option_descriptors_get(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 aa214a533ace950b56467997f9834ec90b9a9534..e9e8adcdbaf8266eafac7ec432fbd46bbae9bb21 100644 (file)
--- a/src/kds_s2000w_option_descriptors.c
+++ b/src/kds_s2000w_option_descriptors.c
@@ -490,7 +490,7 @@ SANE_Option_Descriptor _kds_s2000w_option_descriptor_config_reset()
        return descriptor;
 }
 
-void kds_s2000w_option_descriptor_init_option_descriptors()
+void kds_s2000w_option_descriptors_init()
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_init_option_descriptors");
 
@@ -519,7 +519,7 @@ void kds_s2000w_option_descriptor_init_option_descriptors()
        descriptor_array[21] = _kds_s2000w_option_descriptor_config_reset();
 }
 
-void kds_s2000w_option_descriptor_free_option_descriptors()
+void kds_s2000w_option_descriptors_free()
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_descriptor_free_option_descriptors");
 
@@ -547,7 +547,7 @@ void kds_s2000w_option_descriptor_free_option_descriptors()
        descriptor_array = NULL;
 }
 
-SANE_Option_Descriptor* kds_s2000w_option_get_descriptor(int option)
+SANE_Option_Descriptor* kds_s2000w_option_descriptors_get(int option)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_option_get_descriptor");
 

diff --git a/src/kds_s2000w_option_descriptors.h b/src/kds_s2000w_option_descriptors.h
index fc08f5b9c038083da5d0c7c21dea0e9e12c9c6fa..da90f97c815fed2d5629130c199da1be33d53e57 100644 (file)
--- a/src/kds_s2000w_option_descriptors.h
+++ b/src/kds_s2000w_option_descriptors.h
@@ -4,8 +4,9 @@
 
 #define MAX_OPTION_COUNT 22
 
-void kds_s2000w_option_descriptor_init_option_descriptors();
-void kds_s2000w_option_descriptor_free_option_descriptors();
-SANE_Option_Descriptor* kds_s2000w_option_get_descriptor(int option);
+void kds_s2000w_option_descriptors_init();
+void kds_s2000w_option_descriptors_free();
+
+SANE_Option_Descriptor* kds_s2000w_option_descriptors_get(int option);
 
 #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 7e531aace3add5ce25884c77698b095fc92acb40..b2e37daed852d03f9e302ffe186468020f335be1 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -6,20 +6,20 @@
 
 int setup(void** state)
 {
-       kds_s2000w_option_descriptor_init_option_descriptors();
+       kds_s2000w_option_descriptors_init();
 
        return 0;
 }
 
 int teardown(void **state)
 {
-       kds_s2000w_option_descriptor_free_option_descriptors();
+       kds_s2000w_option_descriptors_free();
        return 0;
 }
 
 void kds_s2000w_option_get_descriptor_zero()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(0);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(0);
 
        assert_string_equal(SANE_NAME_NUM_OPTIONS, option->name);
        assert_string_equal(SANE_TITLE_NUM_OPTIONS, option->title);
@@ -33,7 +33,7 @@ void kds_s2000w_option_get_descriptor_zero()
 
 void kds_s2000w_option_get_descriptor_one()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(1);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(1);
 
        assert_string_equal(SANE_NAME_STANDARD, option->name);
        assert_string_equal(SANE_TITLE_STANDARD, option->title);
@@ -47,7 +47,7 @@ void kds_s2000w_option_get_descriptor_one()
 
 void kds_s2000w_option_get_descriptor_two()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(2);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(2);
 
        assert_string_equal(SANE_NAME_SCAN_SOURCE, option->name);
        assert_string_equal(SANE_TITLE_SCAN_SOURCE, option->title);
@@ -65,7 +65,7 @@ void kds_s2000w_option_get_descriptor_two()
 
 void kds_s2000w_option_get_descriptor_three()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(3);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(3);
 
        assert_string_equal(SANE_NAME_SCAN_MODE, option->name);
        assert_string_equal(SANE_TITLE_SCAN_MODE, option->title);
@@ -83,7 +83,7 @@ void kds_s2000w_option_get_descriptor_three()
 
 void kds_s2000w_option_get_descriptor_four()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(4);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(4);
 
        assert_string_equal(SANE_NAME_SCAN_RESOLUTION, option->name);
        assert_string_equal(SANE_TITLE_SCAN_RESOLUTION, option->title);
@@ -100,7 +100,7 @@ void kds_s2000w_option_get_descriptor_four()
 
 void kds_s2000w_option_get_descriptor_five()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(5);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(5);
 
        assert_string_equal("scanside", option->name);
        assert_string_equal("Duplex Mode", option->title);
@@ -117,7 +117,7 @@ void kds_s2000w_option_get_descriptor_five()
 
 void kds_s2000w_option_get_descriptor_six()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(6);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(6);
 
        assert_string_equal(SANE_NAME_GEOMETRY, option->name);
        assert_string_equal(SANE_TITLE_GEOMETRY, option->title);
@@ -131,7 +131,7 @@ void kds_s2000w_option_get_descriptor_six()
 
 void kds_s2000w_option_get_descriptor_seven()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(7);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(7);
 
        assert_string_equal("skip-blank-pages", option->name);
        assert_string_equal("Blank Image Deletion Mode", option->title);
@@ -145,7 +145,7 @@ void kds_s2000w_option_get_descriptor_seven()
 
 void kds_s2000w_option_get_descriptor_eight()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(8);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(8);
 
        assert_string_equal("colordrop", option->name);
        assert_string_equal("colordrop", option->title);
@@ -168,7 +168,7 @@ void kds_s2000w_option_get_descriptor_eight()
 
 void kds_s2000w_option_get_descriptor_nine()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(9);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(9);
 
        assert_string_equal("colordropoutaggressiveness", option->name);
        assert_string_equal("colordropoutaggressiveness", option->title);
@@ -185,7 +185,7 @@ void kds_s2000w_option_get_descriptor_nine()
 
 void kds_s2000w_option_get_descriptor_ten()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(10);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(10);
 
        assert_string_equal("colorautobrightnessmode", option->name);
        assert_string_equal("colorautobrightnessmode", option->title);
@@ -202,7 +202,7 @@ void kds_s2000w_option_get_descriptor_ten()
 
 void kds_s2000w_option_get_descriptor_eleven()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(11);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(11);
 
        assert_string_equal("colorbalancemode", option->name);
        assert_string_equal("colorbalancemode", option->title);
@@ -221,7 +221,7 @@ void kds_s2000w_option_get_descriptor_eleven()
 
 void kds_s2000w_option_get_descriptor_twelve()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(12);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(12);
 
        assert_string_equal("colorbalanceaggressiveness", option->name);
        assert_string_equal("colorbalanceaggressiveness", option->title);
@@ -238,7 +238,7 @@ void kds_s2000w_option_get_descriptor_twelve()
 
 void kds_s2000w_option_get_descriptor_thirdteen()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(13);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(13);
 
        assert_string_equal("colorbalancered", option->name);
        assert_string_equal("colorbalancered", option->title);
@@ -255,7 +255,7 @@ void kds_s2000w_option_get_descriptor_thirdteen()
 
 void kds_s2000w_option_get_descriptor_fourteen()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(14);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(14);
 
        assert_string_equal("colorbalancegreen", option->name);
        assert_string_equal("colorbalancegreen", option->title);
@@ -272,7 +272,7 @@ void kds_s2000w_option_get_descriptor_fourteen()
 
 void kds_s2000w_option_get_descriptor_fifteen()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(15);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(15);
 
        assert_string_equal("colorbalanceblue", option->name);
        assert_string_equal("colorbalanceblue", option->title);
@@ -289,7 +289,7 @@ void kds_s2000w_option_get_descriptor_fifteen()
 
 void kds_s2000w_option_get_descriptor_sixteen()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(16);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(16);
 
        assert_string_equal("foreground-boldness-mode", option->name);
        assert_string_equal("Foreground Boldness Mode", option->title);
@@ -307,7 +307,7 @@ void kds_s2000w_option_get_descriptor_sixteen()
 
 void kds_s2000w_option_get_descriptor_seventeen()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(17);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(17);
 
        assert_string_equal("foreground-boldness-aggressiveness", option->name);
        assert_string_equal("Foreground Boldness Aggressiveness", option->title);
@@ -324,7 +324,7 @@ void kds_s2000w_option_get_descriptor_seventeen()
 
 void kds_s2000w_option_get_descriptor_eightteen()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(18);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(18);
 
        assert_string_equal("background-smoothing-mode", option->name);
        assert_string_equal("Background Smoothing Mode", option->title);
@@ -342,7 +342,7 @@ void kds_s2000w_option_get_descriptor_eightteen()
 
 void kds_s2000w_option_get_descriptor_nineteen()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(19);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(19);
 
        assert_string_equal("background-smoothing-aggressiveness", option->name);
        assert_string_equal("Background Smoothing Aggressivenes", option->title);
@@ -359,7 +359,7 @@ void kds_s2000w_option_get_descriptor_nineteen()
 
 void kds_s2000w_option_get_descriptor_twenty()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(20);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(20);
 
        assert_string_equal(SANE_NAME_CONTRAST, option->name);
        assert_string_equal(SANE_TITLE_CONTRAST, option->title);
@@ -376,7 +376,7 @@ void kds_s2000w_option_get_descriptor_twenty()
 
 void kds_s2000w_option_get_descriptor_twentyone()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(21);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(21);
 
        assert_string_equal("config-reset", option->name);
        assert_string_equal("reset config", option->title);
@@ -390,7 +390,7 @@ void kds_s2000w_option_get_descriptor_twentyone()
 
 void kds_s2000w_option_get_descriptor_over_max_options()
 {
-       SANE_Option_Descriptor* option = kds_s2000w_option_get_descriptor(MAX_OPTION_COUNT);
+       SANE_Option_Descriptor* option = kds_s2000w_option_descriptors_get(MAX_OPTION_COUNT);
 
        assert_null(option);
 }
\ No newline at end of file