remove handler get available option method

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index ad3e249f6764904bdbfe4d56dd044d63f1667bc7..7a97feeb769458b41625bf450a15e184dedc62cb 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -72,7 +72,7 @@ connection_state_t kds_s2000w_handler_open(void** handle);
 void kds_s2000w_handler_close(handler_t* h);
 void kds_s2000w_handler_recreate_session(handler_t* h);
 
-mask_option_groups_t kds_s2000w_handler_get_available_options(handler_t* h);
+mask_option_groups_t kds_s2000w_handler_get_available_options();
 int32_t kds_s2000w_handler_opts_get_option(handler_t* handle, uint32_t option, void* value, int32_t* info);
 int32_t kds_s2000w_handler_opts_set_option(handler_t* handle, uint32_t option, void* value, int32_t* info);
 

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 45a640bfce68d63317fd9194deb7b9f2821ef1bf..4c8593e8f905df123a86dec8e4e5c44b3b9cbef2 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -542,7 +542,7 @@ void _kds_s2000w_handler_opts_set_depends_opts(const handler_t* h,
        }
 }
 
-mask_option_groups_t kds_s2000w_handler_get_available_options(handler_t* h)
+mask_option_groups_t kds_s2000w_handler_get_available_options()
 {
        response_t* resp = kds_s2000w_client_response_init();
        kds_s2000w_client_get_capabilities(resp);

diff --git a/src/kds_s2000w_handler_opts.h b/src/kds_s2000w_handler_opts.h
index 75ccd69880fef5dcf2edc49737ffe839c34e3767..1254519bef1b384a87276a0e8b74f2402fb69145 100644 (file)
--- a/src/kds_s2000w_handler_opts.h
+++ b/src/kds_s2000w_handler_opts.h
@@ -3,6 +3,7 @@
 #include <stdint.h>
 #include "kds_s2000w_handler.h"
 
+mask_option_groups_t kds_s2000w_handler_get_available_options();
 int32_t kds_s2000w_handler_opts_get_option(handler_t* h, uint32_t option, void* value, int32_t* info);
 int32_t kds_s2000w_handler_opts_set_option(handler_t* h, uint32_t option, void* value, int32_t* info);
 

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index 08b55c99b2f24f241c65ac51afac851fcbceea49..fc31f3067db77a60db6cc302d35188c00857858a 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -886,12 +886,10 @@ void kds_s2000w_handler_depth_eight_calc_bytes_per_line_tests()
 
 void kds_s2000w_handler_available_options_test()
 {
-       handler_t* h = kds_s2000w_handler_init();
-
        will_return(mock_response, NULL);
        will_return(__wrap_kds_s2000w_client_get_capabilities, 0);
        expect_function_call(__wrap_kds_s2000w_client_get_capabilities);
-       mask_option_groups_t option_mask = kds_s2000w_handler_get_available_options(h);
+       mask_option_groups_t option_mask = kds_s2000w_handler_get_available_options();
 
        assert_int_equal(option_mask.stanard_group, 0);
        assert_int_equal(option_mask.geometry_group, 0);
@@ -899,9 +897,6 @@ void kds_s2000w_handler_available_options_test()
        assert_int_equal(option_mask.boldness_color_group, 0);
        assert_int_equal(option_mask.image_processing_group, 0);
        assert_int_equal(option_mask.feeder_group, 0);
-
-       kds_s2000w_handler_free(h);
-       h = NULL;
 }
 
 int main()