change rename scanner config

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index 5fcc4a9da9f4e226f2e7def8f047c7e1892817f1..1ca34fdba24cc057aa14d5487080b86660ae8bb9 100644 (file)
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -81,7 +81,7 @@ void _kds_s2000w_handler_load_config(handler* h)
 
 uint32_t _kds_s2000w_handler_is_color(const handler* h)
 {
-       json_object* config = json_object_object_get(h->current_scanner_config, "Configuration");
+       json_object* config = json_object_object_get(h->scanner_config, "Configuration");
        json_object* color_mode = json_object_object_get(config, "ColorMode");
        const char* color_value = json_object_get_string(color_mode);
 
@@ -99,7 +99,7 @@ handler* kds_s2000w_handler_init()
        if (h == NULL)
                return NULL;
 
-       h->current_scanner_config = NULL;
+       h->scanner_config = NULL;
        h->scan_status = malloc(sizeof(scan_status_t));
        h->read_info = malloc(sizeof(readinfo));
        h->image = malloc(sizeof(imagedata));
@@ -132,8 +132,8 @@ void kds_s2000w_handler_free(handler* h)
        if (h == NULL)
                return;
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
        free(h->scan_status);
        h->scan_status = NULL;
        free(h->read_info);
@@ -215,15 +215,15 @@ void kds_s2000w_handler_open(const char* devicename, void** handle)
                return;
        }
 
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        json_object* value_object = NULL;
-       json_object_object_get_ex(h->current_scanner_config, "SessionId", &value_object);
+       json_object_object_get_ex(h->scanner_config, "SessionId", &value_object);
        h->sessionid = json_object_get_int64(value_object);
        kds_s2000w_debug_printf_long(INFO, "SessionId", h->sessionid);
        value_object = NULL;
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
        kds_s2000w_client_response_free(resp);
        resp = NULL;
 }
@@ -235,8 +235,8 @@ void kds_s2000w_handler_close(handler* h)
        if (h == NULL)
                return;
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
        kds_s2000w_client_close_session(h->sessionid);
        kds_s2000w_client_free();
        h->sessionid = 0;
@@ -269,7 +269,7 @@ void kds_s2000w_handler_recreate_session(handler* h)
        /* set old config parameters */
        kds_s2000w_client_response_free(resp);
        resp = NULL;
-       const char* json_string = json_object_to_json_string_ext(h->current_scanner_config, JSON_C_TO_STRING_PLAIN);
+       const char* json_string = json_object_to_json_string_ext(h->scanner_config, JSON_C_TO_STRING_PLAIN);
        resp = kds_s2000w_client_response_init();
        resp->size = sizeof(char) * strlen(json_string);
        resp->code = 0;

diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h
index 7147b9575c57381cc58efdac2e22bacb7962f299..d12f68627b32c6d85743930cff403ddb5f143efd 100644 (file)
--- a/src/kds_s2000w_handler.h
+++ b/src/kds_s2000w_handler.h
@@ -59,7 +59,7 @@ typedef struct {
        uint8_t profile;
        uint64_t sessionid;
        uint8_t state;
-       json_object* current_scanner_config;
+       json_object* scanner_config;
        scan_status_t* scan_status;
        readinfo* read_info;
        imagedata* image;

diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c
index 5e261943811b8631d5c295db31c50a36e0d79dff..05d7ffd318ddb75efca2bf56bb0d289264b4d635 100644 (file)
--- a/src/kds_s2000w_handler_opts.c
+++ b/src/kds_s2000w_handler_opts.c
@@ -40,8 +40,8 @@ void _kds_s2000w_handler_opts_write_value(json_object* value_object, SANE_Value_
 
 void _kds_s2000w_handler_opts_load_options(handler* h)
 {
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
 
        response* resp = kds_s2000w_client_response_init();
        uint8_t result = kds_s2000w_client_get_option(h->sessionid, resp);
@@ -53,7 +53,7 @@ void _kds_s2000w_handler_opts_load_options(handler* h)
                return;
        }
 
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
 
        kds_s2000w_client_response_free(resp);
        resp = NULL;
@@ -75,10 +75,10 @@ void _kds_s2000w_handler_opts_set_option_to_default(handler* h)
        json_object* default_config = json_object_new_object();
        json_object_object_add(default_config, CONFIGURATION, default_values);
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
 
-       h->current_scanner_config = default_config;
+       h->scanner_config = default_config;
 
        kds_s2000w_client_response_free(resp);
        resp = NULL;
@@ -87,10 +87,10 @@ void _kds_s2000w_handler_opts_set_option_to_default(handler* h)
 json_object* _kds_s2000w_handler_opts_reset(const option_descriptor* descriptor, handler* h)
 {
        if (strcmp(descriptor->config_name, RESET) != 0)
-               return json_object_object_get(h->current_scanner_config, CONFIGURATION);
+               return json_object_object_get(h->scanner_config, CONFIGURATION);
 
        _kds_s2000w_handler_opts_set_option_to_default(h);
-       json_object* config = json_object_object_get(h->current_scanner_config, CONFIGURATION);
+       json_object* config = json_object_object_get(h->scanner_config, CONFIGURATION);
        _kds_s2000w_handler_opts_set_autostart_on(config);
 
        return config;
@@ -98,7 +98,7 @@ json_object* _kds_s2000w_handler_opts_reset(const option_descriptor* descriptor,
 
 void _kds_s2000w_handler_opts_set_options(handler* h)
 {
-       const char* json_string = json_object_to_json_string_ext(h->current_scanner_config, JSON_C_TO_STRING_PLAIN);
+       const char* json_string = json_object_to_json_string_ext(h->scanner_config, JSON_C_TO_STRING_PLAIN);
        response* resp = kds_s2000w_client_response_init();
        resp->size = sizeof(char) * strlen(json_string);
        resp->code = 0;
@@ -114,11 +114,11 @@ void _kds_s2000w_handler_opts_set_options(handler* h)
 
 json_object* _kds_s2000w_handler_opts_load_config(handler* h)
 {
-       if (h->current_scanner_config != NULL)
-               return json_object_object_get(h->current_scanner_config, CONFIGURATION);
+       if (h->scanner_config != NULL)
+               return json_object_object_get(h->scanner_config, CONFIGURATION);
 
        _kds_s2000w_handler_opts_load_options(h);
-       json_object* config = json_object_object_get(h->current_scanner_config, CONFIGURATION);
+       json_object* config = json_object_object_get(h->scanner_config, CONFIGURATION);
        _kds_s2000w_handler_opts_set_autostart_on(config);
        _kds_s2000w_handler_opts_set_options(h);
 
@@ -139,7 +139,7 @@ void _kds_s2000w_handler_opts_set_valid_coord_x(option_descriptor* descriptor, h
        kds_s2000w_debug_printf_int(DEBUG, "valid width", h->coord->width);
        kds_s2000w_debug_printf_int(DEBUG, "valid height", h->coord->height);
 
-       json_object* config = json_object_object_get(h->current_scanner_config, CONFIGURATION);
+       json_object* config = json_object_object_get(h->scanner_config, CONFIGURATION);
        json_object* value_object = json_object_object_get(config, IMAGE_OFFSET_X);
        json_object_set_int(value_object, h->coord->offset_x);
        value_object = json_object_object_get(config, IMAGE_WIDTH);
@@ -158,7 +158,7 @@ void _kds_s2000w_handler_opts_set_valid_coord_y(option_descriptor* descriptor, h
        kds_s2000w_debug_printf_int(DEBUG, "valid offset y", h->coord->offset_y);
        kds_s2000w_debug_printf_int(DEBUG, "valid height", h->coord->height);
 
-       json_object* config = json_object_object_get(h->current_scanner_config, CONFIGURATION);
+       json_object* config = json_object_object_get(h->scanner_config, CONFIGURATION);
        json_object* value_object = json_object_object_get(config, IMAGE_OFFSET_Y);
        json_object_set_int(value_object, h->coord->offset_y);
        value_object = json_object_object_get(config, IMAGE_HEIGHT);

diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c
index f9ccbd3c1b1f46a3d3759299e7a1f5ba43bfd459..97126425097ad4f1f25b612ce5069103226d3348 100644 (file)
--- a/tests/kds_s2000w_net_get_opt_tests.c
+++ b/tests/kds_s2000w_net_get_opt_tests.c
@@ -116,7 +116,7 @@ void sane_kds_s2000w_net_control_get_option_two_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->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);
@@ -131,7 +131,7 @@ void sane_kds_s2000w_net_control_get_option_three_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->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);
@@ -146,7 +146,7 @@ void sane_kds_s2000w_net_control_get_option_four_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = 0;
 
        sane_kds_s2000w_net_control_option(h, 4, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -161,7 +161,7 @@ void sane_kds_s2000w_net_control_get_option_five_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->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);
@@ -176,7 +176,7 @@ void sane_kds_s2000w_net_control_get_option_seven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 7, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -191,7 +191,7 @@ void sane_kds_s2000w_net_control_get_option_eight_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->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);
@@ -206,7 +206,7 @@ void sane_kds_s2000w_net_control_get_option_nine_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 9, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -221,7 +221,7 @@ void sane_kds_s2000w_net_control_get_option_ten_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 10, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -236,7 +236,7 @@ void sane_kds_s2000w_net_control_get_option_eleven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 11, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -251,7 +251,7 @@ void sane_kds_s2000w_net_control_get_option_twelve_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 12, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -266,7 +266,7 @@ void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 14, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -281,7 +281,7 @@ void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 15, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -296,7 +296,7 @@ void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->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);
@@ -311,7 +311,7 @@ void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 17, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -326,7 +326,7 @@ void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 19, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -341,7 +341,7 @@ void sane_kds_s2000w_net_control_get_option_twenty_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 20, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -356,7 +356,7 @@ void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 21, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -371,7 +371,7 @@ void sane_kds_s2000w_net_control_get_option_twentytwo_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 22, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -386,7 +386,7 @@ void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 23, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -401,7 +401,7 @@ void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 24, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -416,7 +416,7 @@ void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 25, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -431,7 +431,7 @@ void sane_kds_s2000w_net_control_get_option_twentysix_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 26, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -446,7 +446,7 @@ void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 27, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -461,7 +461,7 @@ void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 28, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -476,7 +476,7 @@ void sane_kds_s2000w_net_control_get_option_twentynine_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 29, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -491,7 +491,7 @@ void sane_kds_s2000w_net_control_get_option_thirdy_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 30, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -506,7 +506,7 @@ void sane_kds_s2000w_net_control_get_option_thirdythree_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        int32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 33, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -521,7 +521,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 34, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -536,7 +536,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyfive_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 35, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -551,7 +551,7 @@ void sane_kds_s2000w_net_control_get_option_thirdysix_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 36, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -566,7 +566,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 37, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -581,7 +581,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 38, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -596,7 +596,7 @@ void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 39, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -611,7 +611,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = 0;
 
        sane_kds_s2000w_net_control_option(h, 41, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -626,7 +626,7 @@ void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 42, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -641,7 +641,7 @@ void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 43, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -656,7 +656,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 44, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -671,7 +671,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyfive_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 45, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -686,7 +686,7 @@ void sane_kds_s2000w_net_control_get_option_fourtysix_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        uint32_t value = -1;
 
        sane_kds_s2000w_net_control_option(h, 46, SANE_ACTION_GET_VALUE, &value, NULL);
@@ -701,7 +701,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyseven_test(void** state)
 {
        handler* h = kds_s2000w_handler_init();
        response* resp = (response*) *state;
-       h->current_scanner_config = json_tokener_parse(resp->data);
+       h->scanner_config = json_tokener_parse(resp->data);
        char value[50] = {0};
 
        sane_kds_s2000w_net_control_option(h, 47, SANE_ACTION_GET_VALUE, &value, NULL);

diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c
index fe602af3531aab2446914cf1a81b0f526d1f781d..e51f046c19b521f9856e252984ba4a209d41555c 100644 (file)
--- a/tests/kds_s2000w_net_tests.c
+++ b/tests/kds_s2000w_net_tests.c
@@ -136,7 +136,7 @@ void sane_kds_s2000w_net_get_parameter_color_test()
        if (h == NULL)
                return;
        const char* config = "{\"Configuration\":{\"ColorMode\":\"Color\"}}";
-       h->current_scanner_config = json_tokener_parse(config);
+       h->scanner_config = json_tokener_parse(config);
        h->image->size = 17;
        h->image->data = malloc(sizeof(char) * 17);
        char* image_data = (char*) h->image->data;
@@ -192,7 +192,7 @@ void sane_kds_s2000w_net_get_parameter_bw_test()
        if (h == NULL)
                return;
        const char* config = "{\"Configuration\":{\"ColorMode\":\"Color\"}}";
-       h->current_scanner_config = json_tokener_parse(config);
+       h->scanner_config = json_tokener_parse(config);
        h->image->size = 17;
        h->image->data = malloc(sizeof(char) * 17);
        char* image_data = (char*) h->image->data;
@@ -353,15 +353,15 @@ void sane_kds_s2000w_net_start_test(void** state)
        expect_function_call(__wrap_kds_s2000w_client_delete_image);
        handler* h = kds_s2000w_handler_init();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
-       h->current_scanner_config = json_tokener_parse(test_config);
+       h->scanner_config = json_tokener_parse(test_config);
 
        int result = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_false(h->scan_status->completed);
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
        kds_s2000w_handler_free(h);
@@ -398,15 +398,15 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state)
        expect_function_call(__wrap_kds_s2000w_client_delete_image);
        handler* h = kds_s2000w_handler_init();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
-       h->current_scanner_config = json_tokener_parse(test_config);
+       h->scanner_config = json_tokener_parse(test_config);
 
        int result = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_false(h->scan_status->completed);
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
        kds_s2000w_handler_free(h);
@@ -445,15 +445,15 @@ void sane_kds_s2000w_net_start_one_page_per_feeder_test(void** state)
        expect_function_call(__wrap_kds_s2000w_client_stop_scan);
        handler* h = kds_s2000w_handler_init();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
-       h->current_scanner_config = json_tokener_parse(test_config);
+       h->scanner_config = json_tokener_parse(test_config);
 
        int result = sane_kds_s2000w_net_start(h);
 
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_true(h->scan_status->completed);
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
        kds_s2000w_handler_free(h);
@@ -493,7 +493,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
 
        handler* h = kds_s2000w_handler_init();
        const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }";
-       h->current_scanner_config = json_tokener_parse(test_config);
+       h->scanner_config = json_tokener_parse(test_config);
 
        sane_kds_s2000w_net_start(h);
 
@@ -528,8 +528,8 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state)
        assert_int_equal(result, SANE_STATUS_GOOD);
        assert_true(h->scan_status->completed);
 
-       json_object_put(h->current_scanner_config);
-       h->current_scanner_config = NULL;
+       json_object_put(h->scanner_config);
+       h->scanner_config = NULL;
        kds_s2000w_client_response_free(resp_status);
        resp_status = NULL;
        kds_s2000w_handler_free(h);