fix library symbols

diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index 43d0f1110d6c95a5c11a8c6f21bdcf9bfe5e3ca0..47d87c1aa45b36daa62f912979cb5858f272fbcc 100644 (file)
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -13,7 +13,7 @@
 SANE_Device* device_info_ptr;
 SANE_Device device_info;
 
-SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize)
+SANE_Status sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_init");
 
@@ -22,12 +22,12 @@ SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback
        return SANE_STATUS_GOOD;
 }
 
-void _sane_kds_s2000w_net_exit(void)
+void sane_kds_s2000w_net_exit(void)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_exit");
 }
 
-SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list,
+SANE_Status sane_kds_s2000w_net_get_devices(SANE_Device*** device_list,
        SANE_Bool local_only)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_get_devices");
@@ -45,7 +45,7 @@ SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list,
        return SANE_STATUS_GOOD;
 }
 
-SANE_Status _sane_kds_s2000w_net_open(SANE_String_Const devicename,
+SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename,
        SANE_Handle* handle)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_open");
@@ -74,7 +74,7 @@ SANE_Status _sane_kds_s2000w_net_open(SANE_String_Const devicename,
        return SANE_STATUS_GOOD;
 }
 
-void _sane_kds_s2000w_net_close(SANE_Handle handle)
+void sane_kds_s2000w_net_close(SANE_Handle handle)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_close");
 
@@ -86,7 +86,7 @@ void _sane_kds_s2000w_net_close(SANE_Handle handle)
        kds_s2000w_handler_close(handle);
 }
 
-const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(
+const SANE_Option_Descriptor* sane_kds_s2000w_net_get_option_descriptor(
        SANE_Handle handle, SANE_Int option)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_get_option_descriptor");
@@ -94,7 +94,7 @@ const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(
        return kds_s2000w_option_get_descriptor(option);
 }
 
-SANE_Status _sane_kds_s2000w_net_control_option(SANE_Handle handle,
+SANE_Status sane_kds_s2000w_net_control_option(SANE_Handle handle,
        SANE_Int option, SANE_Action action, void* value, SANE_Int* info)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_control_option");
@@ -109,7 +109,7 @@ SANE_Status _sane_kds_s2000w_net_control_option(SANE_Handle handle,
        return SANE_STATUS_GOOD;
 }
 
-void _sane_kds_s2000w_net_cancel(SANE_Handle handle)
+void sane_kds_s2000w_net_cancel(SANE_Handle handle)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_cancel");
 
@@ -142,7 +142,7 @@ void _sane_kds_s2000w_net_cancel(SANE_Handle handle)
        kds_s2000w_handler_stop_scan(h);
 }
 
-SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
+SANE_Status sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        SANE_Parameters* params)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_get_parameters");
@@ -155,7 +155,7 @@ SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,
        return SANE_STATUS_GOOD;
 }
 
-SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle)
+SANE_Status sane_kds_s2000w_net_start(SANE_Handle handle)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_start");
 
@@ -194,7 +194,7 @@ SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle)
        return SANE_STATUS_GOOD;
 }
 
-SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
+SANE_Status sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        SANE_Int max_length, SANE_Int* length)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_read");
@@ -219,7 +219,7 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
        return SANE_STATUS_GOOD;
 }
 
-SANE_Status _sane_kds_s2000w_net_set_io_mode(SANE_Handle handle,
+SANE_Status sane_kds_s2000w_net_set_io_mode(SANE_Handle handle,
        SANE_Bool non_blocking)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_set_io_mode");
@@ -227,7 +227,7 @@ SANE_Status _sane_kds_s2000w_net_set_io_mode(SANE_Handle handle,
        return SANE_STATUS_UNSUPPORTED;
 }
 
-SANE_Status _sane_kds_s2000w_net_get_select_fd(SANE_Handle handle, SANE_Int* fd)
+SANE_Status sane_kds_s2000w_net_get_select_fd(SANE_Handle handle, SANE_Int* fd)
 {
        debug_printf(ALL, "sane_kds_s2000w_net_get_select_fd");
 

diff --git a/src/kds_s2000w_net.h b/src/kds_s2000w_net.h
index c7faa4ec5bd8e78adc038ce1869d022d22df123f..7efb31cae59d673a565fe422a5ae1b4748b7c6b3 100644 (file)
--- a/src/kds_s2000w_net.h
+++ b/src/kds_s2000w_net.h
@@ -2,18 +2,18 @@
 #define KDS_S2000W_NET_H
 #include <sane/sane.h>
 
-SANE_Status _sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize);
-void _sane_kds_s2000w_net_exit(void);
-SANE_Status _sane_kds_s2000w_net_get_devices(SANE_Device*** device_list, SANE_Bool local_only);
-SANE_Status _sane_kds_s2000w_net_open(SANE_String_Const devicename, SANE_Handle* handle);
-void _sane_kds_s2000w_net_close(SANE_Handle handle);
-SANE_Status _sane_kds_s2000w_net_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void* value, SANE_Int* info);
-const SANE_Option_Descriptor* _sane_kds_s2000w_net_get_option_descriptor(SANE_Handle handle, SANE_Int option);
-void _sane_kds_s2000w_net_cancel(SANE_Handle handle);
-SANE_Status _sane_kds_s2000w_net_get_parameters(SANE_Handle handle,    SANE_Parameters* params);
-SANE_Status _sane_kds_s2000w_net_start(SANE_Handle handle);
-SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data, SANE_Int max_length, SANE_Int* length);
-SANE_Status _sane_kds_s2000w_net_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking);
-SANE_Status _sane_kds_s2000w_net_get_select_fd(SANE_Handle handle, SANE_Int* fd);
+SANE_Status sane_kds_s2000w_net_init(SANE_Int* version_code, SANE_Auth_Callback authorize);
+void sane_kds_s2000w_net_exit(void);
+SANE_Status sane_kds_s2000w_net_get_devices(SANE_Device*** device_list, SANE_Bool local_only);
+SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename, SANE_Handle* handle);
+void sane_kds_s2000w_net_close(SANE_Handle handle);
+SANE_Status sane_kds_s2000w_net_control_option(SANE_Handle handle, SANE_Int option, SANE_Action action, void* value, SANE_Int* info);
+const SANE_Option_Descriptor* sane_kds_s2000w_net_get_option_descriptor(SANE_Handle handle, SANE_Int option);
+void sane_kds_s2000w_net_cancel(SANE_Handle handle);
+SANE_Status sane_kds_s2000w_net_get_parameters(SANE_Handle handle,     SANE_Parameters* params);
+SANE_Status sane_kds_s2000w_net_start(SANE_Handle handle);
+SANE_Status sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data, SANE_Int max_length, SANE_Int* length);
+SANE_Status sane_kds_s2000w_net_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking);
+SANE_Status sane_kds_s2000w_net_get_select_fd(SANE_Handle handle, SANE_Int* fd);
 
 #endif
\ No newline at end of file

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index 674581975fbdeb9ed6afcf6fac05d4f2f54acbf1..752012bfbc0889c259425edaccf8f72c167ff20d 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -20,7 +20,7 @@ void sane_kds_s2000w_net_control_get_option_zero(void** state)
        handler* h = init_handler();
        int value = 0;
 
-       _sane_kds_s2000w_net_control_option(h, 0, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 0, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 22);
 
@@ -35,7 +35,7 @@ void sane_kds_s2000w_net_control_get_option_two(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 2, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 2, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "DocumentFeeder");
        assert_int_equal(h->current_scan_status->feeder, 1);
@@ -51,7 +51,7 @@ void sane_kds_s2000w_net_control_get_option_three(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 3, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 3, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "Color");
 
@@ -66,7 +66,7 @@ void sane_kds_s2000w_net_control_get_option_four(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = 0;
 
-       _sane_kds_s2000w_net_control_option(h, 4, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 4, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 200);
 
@@ -81,7 +81,7 @@ void sane_kds_s2000w_net_control_get_option_five(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 5, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 5, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "Duplex");
 
@@ -96,7 +96,7 @@ void sane_kds_s2000w_net_control_get_option_seven(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 7, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 7, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -111,7 +111,7 @@ void sane_kds_s2000w_net_control_get_option_eight(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 8, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 8, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "None");
 
@@ -126,7 +126,7 @@ void sane_kds_s2000w_net_control_get_option_nine(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 9, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 9, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -141,7 +141,7 @@ void sane_kds_s2000w_net_control_get_option_ten(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 10, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 10, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "Automatic");
 
@@ -156,7 +156,7 @@ void sane_kds_s2000w_net_control_get_option_eleven(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 11, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 11, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "Automatic");
 
@@ -171,7 +171,7 @@ void sane_kds_s2000w_net_control_get_option_twelve(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 12, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 12, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -186,7 +186,7 @@ void sane_kds_s2000w_net_control_get_option_thirdteen(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 13, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 13, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -201,7 +201,7 @@ void sane_kds_s2000w_net_control_get_option_fourteen(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 14, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 14, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -216,7 +216,7 @@ void sane_kds_s2000w_net_control_get_option_fifteen(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 15, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 15, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -231,7 +231,7 @@ void sane_kds_s2000w_net_control_get_option_sixteen(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 16, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 16, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "None");
 
@@ -246,7 +246,7 @@ void sane_kds_s2000w_net_control_get_option_seventeen(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 17, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 17, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -261,7 +261,7 @@ void sane_kds_s2000w_net_control_get_option_eightteen(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
-       _sane_kds_s2000w_net_control_option(h, 18, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 18, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_string_equal(value, "None");
 
@@ -276,7 +276,7 @@ void sane_kds_s2000w_net_control_get_option_nineteen(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 19, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 19, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 
@@ -291,7 +291,7 @@ void sane_kds_s2000w_net_control_get_option_twenty(void** state)
        h->current_scanner_config = json_tokener_parse(resp->data);
        int value = -1;
 
-       _sane_kds_s2000w_net_control_option(h, 20, SANE_ACTION_GET_VALUE, &value, NULL);
+       sane_kds_s2000w_net_control_option(h, 20, SANE_ACTION_GET_VALUE, &value, NULL);
 
        assert_int_equal(value, 0);
 

diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index a555bbde42fb6dbb291e706c1aa1d70bc2c5d8f2..66d425f2da75e494f9b78f7cdee3558e89e39641 100644 (file)
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -12,7 +12,7 @@ void sane_kds_s2000w_net_read_without_data()
        handler* h = init_handler();
        char* dataptr = malloc(sizeof(char));
 
-       SANE_Status status = _sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
+       SANE_Status status = sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
 
        assert_int_equal(status, SANE_STATUS_EOF);
 
@@ -30,7 +30,7 @@ void sane_kds_s2000w_net_read_empty_image()
        h->image->size = 0;
        char* dataptr = malloc(sizeof(char));
 
-       SANE_Status status = _sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
+       SANE_Status status = sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length);
 
        assert_int_equal(status, SANE_STATUS_EOF);
 
@@ -56,7 +56,7 @@ void sane_kds_s2000w_net_read_test()
        char* dataptr = malloc(sizeof(char) * maxlen);
        SANE_Int* length = malloc(sizeof(SANE_Int));
 
-       _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
+       sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
 
        assert_int_equal(*length, 65536);
        assert_memory_equal(dataptr, h->image->data, 65536);
@@ -89,8 +89,8 @@ void sane_kds_s2000w_net_read_bytes_per_line_bigger_test()
        char* dataptr = malloc(sizeof(char) * maxlen);
        SANE_Int* length = malloc(sizeof(SANE_Int));
 
-       _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
-       _sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
+       sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
+       sane_kds_s2000w_net_read(h, (void*) dataptr, maxlen, length);
 
        assert_int_equal(h->read_info->read_size, 95003);
 

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index cc54679e1c6d13faf54df586fb7fc8cbad857737..ff37598b7799bceb3f55cdcd598ba0110e63ba29 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -11,7 +11,7 @@ void kds_s2000w_net_get_devices()
 {
        SANE_Device*** device_list = malloc(sizeof(SANE_Device**));
 
-       _sane_kds_s2000w_net_get_devices(device_list, 0);
+       sane_kds_s2000w_net_get_devices(device_list, 0);
        
        assert_string_equal(device_list[0][0]->name, "kds_s2000w_net");
        assert_string_equal(device_list[0][0]->vendor, "Kodak");
@@ -26,7 +26,7 @@ void kds_s2000w_net_init()
 {
        SANE_Int* version = malloc(sizeof(SANE_Int));
 
-       SANE_Status status = _sane_kds_s2000w_net_init(version, NULL);
+       SANE_Status status = sane_kds_s2000w_net_init(version, NULL);
 
        assert_int_equal(*version, SANE_VERSION_CODE(1, 0, 27));
        assert_int_equal(status, SANE_STATUS_GOOD);
@@ -39,7 +39,7 @@ void kds_s2000w_net_get_devices_only_remote()
 {
        SANE_Device*** device_list = malloc(sizeof(SANE_Device**));
 
-       SANE_Status result = _sane_kds_s2000w_net_get_devices(device_list, 1);
+       SANE_Status result = sane_kds_s2000w_net_get_devices(device_list, 1);
 
        assert_int_equal(result, SANE_STATUS_NO_MEM);
 
@@ -49,14 +49,14 @@ void kds_s2000w_net_get_devices_only_remote()
 
 void kds_s2000w_net_set_io_mode()
 {
-       SANE_Status result = _sane_kds_s2000w_net_set_io_mode(NULL, SANE_FALSE);
+       SANE_Status result = sane_kds_s2000w_net_set_io_mode(NULL, SANE_FALSE);
 
        assert_int_equal(result, SANE_STATUS_UNSUPPORTED);
 }
 
 void kds_s2000w_net_get_select_fd()
 {
-       SANE_Status result = _sane_kds_s2000w_net_get_select_fd(NULL, NULL);
+       SANE_Status result = sane_kds_s2000w_net_get_select_fd(NULL, NULL);
 
        assert_int_equal(result, SANE_STATUS_UNSUPPORTED);
 }
@@ -66,7 +66,7 @@ void sane_kds_s2000w_net_start_cancel()
        handler* h = init_handler();
        h->read_info->cancel = 1;
 
-       SANE_Status status = _sane_kds_s2000w_net_start(h);
+       SANE_Status status = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(status, SANE_STATUS_CANCELLED);
 
@@ -74,7 +74,7 @@ void sane_kds_s2000w_net_start_cancel()
        h = NULL;
 }
 
-void sane_kds_s2000w_net_start(void** state)
+void sane_kds_s2000w_net_start_test(void** state)
 {
        response** response_list = (response**) *state;
        will_return(mock_response, response_list[0]);
@@ -108,7 +108,7 @@ void sane_kds_s2000w_net_start(void** state)
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
 
-       int result = _sane_kds_s2000w_net_start(h);
+       int result = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 0);
@@ -156,7 +156,7 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state)
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
 
-       int result = _sane_kds_s2000w_net_start(h);
+       int result = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 0);
@@ -206,7 +206,7 @@ void sane_kds_s2000w_net_start_one_page_per_feeder(void** state)
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
 
-       int result = _sane_kds_s2000w_net_start(h);
+       int result = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 1);
@@ -257,7 +257,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state)
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
        h->current_scanner_config = json_tokener_parse(test_config);
 
-       int result = _sane_kds_s2000w_net_start(h);
+       int result = sane_kds_s2000w_net_start(h);
 
        const char* status2 = "{ \
                \"Status\": { \
@@ -284,7 +284,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state)
        expect_function_call(__wrap_kds_s2000w_client_get_image);
        expect_function_call(__wrap_kds_s2000w_client_delete_image);
        expect_function_call(__wrap_kds_s2000w_client_stop_scan);
-       result = _sane_kds_s2000w_net_start(h);
+       result = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_int_equal(h->current_scan_status->complete_scanned, 1);
@@ -322,7 +322,7 @@ void sane_kds_s2000w_net_get_parameter_color()
 
        SANE_Parameters* params = malloc(sizeof(SANE_Parameters));
 
-       SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, params);
+       SANE_Status status = sane_kds_s2000w_net_get_parameters(h, params);
 
        assert_int_equal(status, SANE_STATUS_GOOD);
        assert_int_equal(params->format, 1);
@@ -360,7 +360,7 @@ void sane_kds_s2000w_net_get_parameter_bw()
 
        SANE_Parameters* params = malloc(sizeof(SANE_Parameters));
 
-       SANE_Status status = _sane_kds_s2000w_net_get_parameters(h, params);
+       SANE_Status status = sane_kds_s2000w_net_get_parameters(h, params);
 
        assert_int_equal(status, SANE_STATUS_GOOD);
        assert_int_equal(params->format, 1);
@@ -378,7 +378,7 @@ void sane_kds_s2000w_net_get_parameter_bw()
 }
 
 
-void sane_kds_s2000w_net_cancel()
+void sane_kds_s2000w_net_cance_testl()
 {
        response* resp_status = kds_s2000w_client_response_init();
        resp_status->data = realloc(resp_status->data, 205);
@@ -407,7 +407,7 @@ void sane_kds_s2000w_net_cancel()
        handler* h = init_handler();
        h->current_scan_status->available_images = 1;
 
-       _sane_kds_s2000w_net_cancel(h);
+       sane_kds_s2000w_net_cancel(h);
 
        assert_int_equal(h->read_info->cancel, 1);
 
@@ -440,7 +440,7 @@ void sane_kds_s2000w_net_cancel_canceled()
        handler* h = init_handler();
        h->read_info->cancel = 1;
 
-       _sane_kds_s2000w_net_cancel(h);
+       sane_kds_s2000w_net_cancel(h);
 
        assert_int_equal(h->read_info->cancel, 0);
 
@@ -475,7 +475,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder()
 
        handler* h = init_handler();
 
-       _sane_kds_s2000w_net_cancel(h);
+       sane_kds_s2000w_net_cancel(h);
 
        assert_int_equal(h->read_info->cancel, 0);
        assert_int_equal(h->current_scan_status->complete_scanned, 0);
@@ -525,7 +525,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed()
 
        handler* h = init_handler();
 
-       _sane_kds_s2000w_net_cancel(h);
+       sane_kds_s2000w_net_cancel(h);
 
        assert_int_equal(h->read_info->cancel, 0);
        assert_int_equal(h->current_scan_status->complete_scanned, 0);
@@ -540,7 +540,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed()
        h = NULL;
 }
 
-void sane_kds_s2000w_net_open()
+void sane_kds_s2000w_net_open_test()
 {
        response* resp = kds_s2000w_client_response_init();
        resp->data = realloc(resp->data, 28);
@@ -553,7 +553,7 @@ void sane_kds_s2000w_net_open()
        expect_function_call(__wrap_kds_s2000w_client_open_session);
        void** hlist = malloc(sizeof(void*));
 
-       SANE_Status status = _sane_kds_s2000w_net_open("kds_s2000w_net", hlist);
+       SANE_Status status = sane_kds_s2000w_net_open("kds_s2000w_net", hlist);
        handler* h = (handler*) *hlist;
 
        assert_int_equal(h->sessionid, 1251877821);
@@ -576,7 +576,7 @@ void sane_kds_s2000w_net_open_busy_device()
        expect_function_call(__wrap_kds_s2000w_client_open_session);
        void** hlist = malloc(sizeof(void*));
 
-       SANE_Status status = _sane_kds_s2000w_net_open("kds_s2000w_net", hlist);
+       SANE_Status status = sane_kds_s2000w_net_open("kds_s2000w_net", hlist);
 
        assert_int_equal(status, SANE_STATUS_DEVICE_BUSY);
 
@@ -590,7 +590,7 @@ void sane_kds_s2000w_net_open_invalid()
 {
        void** hlist = malloc(sizeof(void*));
 
-       SANE_Status status = _sane_kds_s2000w_net_open("wrong_device_name", hlist);
+       SANE_Status status = sane_kds_s2000w_net_open("wrong_device_name", hlist);
 
        assert_int_equal(status, SANE_STATUS_INVAL);
 
@@ -607,7 +607,7 @@ void sane_kds_s2000w_net_open_not_connected()
        expect_function_call(__wrap_kds_s2000w_client_open_session);
        void** hlist = malloc(sizeof(void*));
 
-       SANE_Status status = _sane_kds_s2000w_net_open("kds_s2000w_net", hlist);
+       SANE_Status status = sane_kds_s2000w_net_open("kds_s2000w_net", hlist);
 
        assert_int_equal(status, SANE_STATUS_IO_ERROR);
 

diff --git a/tests/kds_s2000w_net_tests.h b/tests/kds_s2000w_net_tests.h
index c26a7aa81d50142e5f0f5db73ef27a20ca8a3a29..9ce60e773ad6a40468e424e576ed8606685300b3 100644 (file)
--- a/tests/kds_s2000w_net_tests.h
+++ b/tests/kds_s2000w_net_tests.h
@@ -14,15 +14,15 @@ void kds_s2000w_net_get_select_fd();
 void sane_kds_s2000w_net_start_cancel();
 void sane_kds_s2000w_net_cancel_canceled();
 void sane_kds_s2000w_net_cancel_completed_scan_flatbed();
-void sane_kds_s2000w_net_start(void** state);
+void sane_kds_s2000w_net_start_test(void** state);
 void sane_kds_s2000w_net_start_one_page_per_flatscan(void** state);
 void sane_kds_s2000w_net_start_one_page_per_feeder(void** state);
 void sane_kds_s2000w_net_start_two_pages_per_feeder(void** state);
 void sane_kds_s2000w_net_get_parameter_color();
 void sane_kds_s2000w_net_get_parameter_bw();
-void sane_kds_s2000w_net_cancel();
+void sane_kds_s2000w_net_cance_testl();
 void sane_kds_s2000w_net_cancel_completed_scan_feeder();
-void sane_kds_s2000w_net_open();
+void sane_kds_s2000w_net_open_test();
 void sane_kds_s2000w_net_open_busy_device();
 void sane_kds_s2000w_net_open_invalid();
 void sane_kds_s2000w_net_open_not_connected();

diff --git a/tests/kds_s2000w_net_tests_run.c b/tests/kds_s2000w_net_tests_run.c
index 3f645344984bfac69c4488503ef107442cab630d..99db9bb8f836376c083fc03e76c2e8fa7158408c 100644 (file)
--- a/tests/kds_s2000w_net_tests_run.c
+++ b/tests/kds_s2000w_net_tests_run.c
@@ -70,16 +70,16 @@ int main()
                cmocka_unit_test(kds_s2000w_net_get_select_fd),
                cmocka_unit_test(sane_kds_s2000w_net_start_cancel),
                cmocka_unit_test(sane_kds_s2000w_net_cancel_canceled),
-               cmocka_unit_test(sane_kds_s2000w_net_cancel),
+               cmocka_unit_test(sane_kds_s2000w_net_cance_testl),
                cmocka_unit_test(sane_kds_s2000w_net_cancel_completed_scan_feeder),
                cmocka_unit_test(sane_kds_s2000w_net_cancel_completed_scan_flatbed),
-               cmocka_unit_test(sane_kds_s2000w_net_open),
+               cmocka_unit_test(sane_kds_s2000w_net_open_test),
                cmocka_unit_test(sane_kds_s2000w_net_open_busy_device),
                cmocka_unit_test(sane_kds_s2000w_net_open_invalid),
                cmocka_unit_test(sane_kds_s2000w_net_open_not_connected),
                cmocka_unit_test(sane_kds_s2000w_net_get_parameter_color),
                cmocka_unit_test(sane_kds_s2000w_net_get_parameter_bw),
-               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start, setup_net_start, teardown_net_start),
+               cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_test, setup_net_start, teardown_net_start),
                cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_one_page_per_flatscan, setup_net_start, teardown_net_start),
                cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_one_page_per_feeder, setup_net_start, teardown_net_start),
                cmocka_unit_test_setup_teardown(sane_kds_s2000w_net_start_two_pages_per_feeder, setup_net_start, teardown_net_start),