From: Bastian Dehn Date: Fri, 17 Oct 2025 17:17:09 +0000 (+0200) Subject: change rename handler type X-Git-Tag: v1.1.14^2~12 X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=5294938e5ff00ee3fe1f08c33057ecbbeab4bba1;p=sane-kds-s2000w-net.git change rename handler type --- diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 418a2b8..6c94bd0 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -51,7 +51,7 @@ client_config_t* _kds_s2000w_handler_convert_config(program_config_t* config) return client_config; } -void _kds_s2000w_handler_load_config(handler* h) +void _kds_s2000w_handler_load_config(handler_t* h) { kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_load_config"); @@ -79,7 +79,7 @@ void _kds_s2000w_handler_load_config(handler* h) client_config = NULL; } -uint32_t _kds_s2000w_handler_is_color(const handler* h) +uint32_t _kds_s2000w_handler_is_color(const handler_t* h) { json_object* config = json_object_object_get(h->scanner_config, "Configuration"); json_object* color_mode = json_object_object_get(config, "ColorMode"); @@ -91,11 +91,11 @@ uint32_t _kds_s2000w_handler_is_color(const handler* h) return 0; } -handler* kds_s2000w_handler_init() +handler_t* kds_s2000w_handler_init() { kds_s2000w_debug_printf(ALL, "init handler"); - handler* h = malloc(sizeof(handler)); + handler_t* h = malloc(sizeof(handler_t)); if (h == NULL) return NULL; @@ -122,7 +122,7 @@ handler* kds_s2000w_handler_init() return h; } -void kds_s2000w_handler_free(handler* h) +void kds_s2000w_handler_free(handler_t* h) { kds_s2000w_debug_printf(ALL, "free handler"); @@ -142,7 +142,7 @@ void kds_s2000w_handler_free(handler* h) free(h); } -void kds_s2000w_handler_reset(handler* h) +void kds_s2000w_handler_reset(handler_t* h) { kds_s2000w_debug_printf(ALL, "reset handler"); @@ -166,7 +166,7 @@ void kds_s2000w_handler_open(const char* devicename, void** handle) if (strcmp(devicename, DEVICE_NAME) != 0) return; - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); if (h == NULL) return; @@ -221,7 +221,7 @@ void kds_s2000w_handler_open(const char* devicename, void** handle) resp = NULL; } -void kds_s2000w_handler_close(handler* h) +void kds_s2000w_handler_close(handler_t* h) { kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_close"); @@ -236,7 +236,7 @@ void kds_s2000w_handler_close(handler* h) kds_s2000w_handler_free(h); } -void kds_s2000w_handler_recreate_session(handler* h) +void kds_s2000w_handler_recreate_session(handler_t* h) { kds_s2000w_client_close_session(h->sessionid); @@ -274,21 +274,21 @@ void kds_s2000w_handler_recreate_session(handler* h) resp = NULL; } -void kds_s2000w_handler_start_scan(const handler* h) +void kds_s2000w_handler_start_scan(const handler_t* h) { kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_start_scan"); kds_s2000w_client_start_scan(h->sessionid); } -void kds_s2000w_handler_stop_scan(const handler* h) +void kds_s2000w_handler_stop_scan(const handler_t* h) { kds_s2000w_debug_printf(ALL, "kds_s2000w_handler_stop_scan"); kds_s2000w_client_stop_scan(h->sessionid); } -void kds_s2000w_handler_get_current_metadata(handler* h, metadata_t* params) +void kds_s2000w_handler_get_current_metadata(handler_t* h, metadata_t* params) { kds_s2000w_debug_printf(ALL, "get_current_metadata"); @@ -357,7 +357,7 @@ void kds_s2000w_handler_get_current_metadata(handler* h, metadata_t* params) scanner_image = NULL; } -void kds_s2000w_handler_get_current_scan_status(handler* h) +void kds_s2000w_handler_get_current_scan_status(handler_t* h) { kds_s2000w_debug_printf(ALL, "get_current_scan_status"); @@ -385,7 +385,7 @@ void kds_s2000w_handler_get_current_scan_status(handler* h) resp = NULL; } -void kds_s2000w_handler_download_current_image(handler* h) +void kds_s2000w_handler_download_current_image(handler_t* h) { kds_s2000w_debug_printf(ALL, "download_current_image"); @@ -404,7 +404,7 @@ void kds_s2000w_handler_download_current_image(handler* h) h->scan_status->downloaded_images++; } -void kds_s2000w_handler_delete_current_image(handler* h) +void kds_s2000w_handler_delete_current_image(handler_t* h) { kds_s2000w_debug_printf(ALL, "delete_current_image"); diff --git a/src/kds_s2000w_handler.h b/src/kds_s2000w_handler.h index 1f1e525..4a6b7cf 100644 --- a/src/kds_s2000w_handler.h +++ b/src/kds_s2000w_handler.h @@ -65,25 +65,25 @@ typedef struct { scan_status_t* scan_status; imagedata_t* image; coord_t* coord; -} handler; +} handler_t; -handler* kds_s2000w_handler_init(); -void kds_s2000w_handler_free(handler* h); -void kds_s2000w_handler_reset(handler* h); +handler_t* kds_s2000w_handler_init(); +void kds_s2000w_handler_free(handler_t* h); +void kds_s2000w_handler_reset(handler_t* h); void kds_s2000w_handler_open(const char* devicename, void** handle); -void kds_s2000w_handler_close(handler* h); -void kds_s2000w_handler_recreate_session(handler* h); +void kds_s2000w_handler_close(handler_t* h); +void kds_s2000w_handler_recreate_session(handler_t* h); -void kds_s2000w_handler_opts_get_option(handler* handle, uint32_t option, void* value, int32_t* info); -void kds_s2000w_handler_opts_set_option(handler* handle, uint32_t option, void* value, int32_t* info); +void kds_s2000w_handler_opts_get_option(handler_t* handle, uint32_t option, void* value, int32_t* info); +void kds_s2000w_handler_opts_set_option(handler_t* handle, uint32_t option, void* value, int32_t* info); -void kds_s2000w_handler_start_scan(const handler* h); -void kds_s2000w_handler_stop_scan(const handler* h); +void kds_s2000w_handler_start_scan(const handler_t* h); +void kds_s2000w_handler_stop_scan(const handler_t* h); -void kds_s2000w_handler_get_current_metadata(handler* h, metadata_t* params); -void kds_s2000w_handler_get_current_scan_status(handler* h); -void kds_s2000w_handler_download_current_image(handler* h); -void kds_s2000w_handler_delete_current_image(handler* h); +void kds_s2000w_handler_get_current_metadata(handler_t* h, metadata_t* params); +void kds_s2000w_handler_get_current_scan_status(handler_t* h); +void kds_s2000w_handler_download_current_image(handler_t* h); +void kds_s2000w_handler_delete_current_image(handler_t* h); #endif \ No newline at end of file diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 792d844..9d9c33e 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -38,7 +38,7 @@ void _kds_s2000w_handler_opts_write_value(json_object* value_object, SANE_Value_ } } -void _kds_s2000w_handler_opts_load_options(handler* h) +void _kds_s2000w_handler_opts_load_options(handler_t* h) { json_object_put(h->scanner_config); h->scanner_config = NULL; @@ -66,7 +66,7 @@ void _kds_s2000w_handler_opts_set_autostart_on(json_object* config) _kds_s2000w_handler_opts_write_value_to_json(value_object, SANE_TYPE_INT, &auto_start_value); } -void _kds_s2000w_handler_opts_set_option_to_default(handler* h) +void _kds_s2000w_handler_opts_set_option_to_default(handler_t* h) { response_t* resp = kds_s2000w_client_response_init(); kds_s2000w_client_get_capabilities(resp); @@ -84,7 +84,7 @@ void _kds_s2000w_handler_opts_set_option_to_default(handler* h) resp = NULL; } -json_object* _kds_s2000w_handler_opts_reset(const option_descriptor* descriptor, handler* h) +json_object* _kds_s2000w_handler_opts_reset(const option_descriptor* descriptor, handler_t* h) { if (strcmp(descriptor->config_name, RESET) != 0) return json_object_object_get(h->scanner_config, CONFIGURATION); @@ -96,7 +96,7 @@ json_object* _kds_s2000w_handler_opts_reset(const option_descriptor* descriptor, return config; } -void _kds_s2000w_handler_opts_set_options(handler* h) +void _kds_s2000w_handler_opts_set_options(handler_t* h) { const char* json_string = json_object_to_json_string_ext(h->scanner_config, JSON_C_TO_STRING_PLAIN); response_t* resp = kds_s2000w_client_response_init(); @@ -112,7 +112,7 @@ void _kds_s2000w_handler_opts_set_options(handler* h) resp = NULL; } -json_object* _kds_s2000w_handler_opts_load_config(handler* h) +json_object* _kds_s2000w_handler_opts_load_config(handler_t* h) { if (h->scanner_config != NULL) return json_object_object_get(h->scanner_config, CONFIGURATION); @@ -125,7 +125,7 @@ json_object* _kds_s2000w_handler_opts_load_config(handler* h) return config; } -void _kds_s2000w_handler_opts_set_valid_coord_x(option_descriptor* descriptor, handler* h) +void _kds_s2000w_handler_opts_set_valid_coord_x(option_descriptor* descriptor, handler_t* h) { bool valid = h->coord->offset_x >= 0 && h->coord->offset_x <= 75; valid = valid && h->coord->width >= 10 && h->coord->width <= 85; @@ -146,7 +146,7 @@ void _kds_s2000w_handler_opts_set_valid_coord_x(option_descriptor* descriptor, h json_object_set_int(value_object, h->coord->width); } -void _kds_s2000w_handler_opts_set_valid_coord_y(option_descriptor* descriptor, handler* h) +void _kds_s2000w_handler_opts_set_valid_coord_y(option_descriptor* descriptor, handler_t* h) { bool valid = h->coord->offset_y >= 0 && h->coord->offset_y <= 130; valid = valid && h->coord->height >= 10 && h->coord->height <= 140; @@ -323,7 +323,7 @@ void _kds_s2000w_handler_opts_set_enable_color_drop_out_aggressiveness(json_obje color_drop_out_aggressiveness->cap &= ~SANE_CAP_SOFT_SELECT; } -void _kds_s2000w_handler_opts_set_offset_x(const option_descriptor* descriptor, handler* h, const void* value) +void _kds_s2000w_handler_opts_set_offset_x(const option_descriptor* descriptor, handler_t* h, const void* value) { if (strcmp(descriptor->config_name, IMAGE_OFFSET_X) != 0) return; @@ -333,7 +333,7 @@ void _kds_s2000w_handler_opts_set_offset_x(const option_descriptor* descriptor, h->coord->offset_x = tenth_inch; } -void _kds_s2000w_handler_opts_set_offset_y(const option_descriptor* descriptor, handler* h, const void* value) +void _kds_s2000w_handler_opts_set_offset_y(const option_descriptor* descriptor, handler_t* h, const void* value) { if (strcmp(descriptor->config_name, IMAGE_OFFSET_Y) != 0) return; @@ -343,7 +343,7 @@ void _kds_s2000w_handler_opts_set_offset_y(const option_descriptor* descriptor, h->coord->offset_y = tenth_inch; } -void _kds_s2000w_handler_opts_set_width(const option_descriptor* descriptor, handler* h, const void* value) +void _kds_s2000w_handler_opts_set_width(const option_descriptor* descriptor, handler_t* h, const void* value) { if (strcmp(descriptor->config_name, IMAGE_WIDTH) != 0) return; @@ -355,7 +355,7 @@ void _kds_s2000w_handler_opts_set_width(const option_descriptor* descriptor, han h->coord->width = tenth_inch_width; } -void _kds_s2000w_handler_opts_set_height(const option_descriptor* descriptor, handler* h, const void* value) +void _kds_s2000w_handler_opts_set_height(const option_descriptor* descriptor, handler_t* h, const void* value) { if (strcmp(descriptor->config_name, IMAGE_HEIGHT) != 0) return; @@ -391,7 +391,7 @@ void _kds_s2000w_handler_opts_set_info_option(const option_descriptor* descripto *info = RELOAD_OPTIONS | RELOAD_PARAMS; } -void _kds_s2000w_handler_opts_set_depends_opts(const handler* h, +void _kds_s2000w_handler_opts_set_depends_opts(const handler_t* h, const char* config_name, json_object* config) { @@ -438,7 +438,7 @@ void _kds_s2000w_handler_opts_set_depends_opts(const handler* h, } } -void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value, int32_t* info) +void kds_s2000w_handler_opts_get_option(handler_t* h, uint32_t option, void* value, int32_t* info) { json_object* config = _kds_s2000w_handler_opts_load_config(h); @@ -492,7 +492,7 @@ void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value _kds_s2000w_handler_opts_write_value(value_object, descriptor->descriptor->type, value); } -void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value, int32_t* info) +void kds_s2000w_handler_opts_set_option(handler_t* h, uint32_t option, void* value, int32_t* info) { if (h->scan_status->state == STARTED) return; diff --git a/src/kds_s2000w_handler_opts.h b/src/kds_s2000w_handler_opts.h index 43efb2d..4c0a276 100644 --- a/src/kds_s2000w_handler_opts.h +++ b/src/kds_s2000w_handler_opts.h @@ -3,7 +3,7 @@ #include #include "kds_s2000w_handler.h" -void kds_s2000w_handler_opts_get_option(handler* h, uint32_t option, void* value, int32_t* info); -void kds_s2000w_handler_opts_set_option(handler* h, uint32_t option, void* value, int32_t* info); +void kds_s2000w_handler_opts_get_option(handler_t* h, uint32_t option, void* value, int32_t* info); +void kds_s2000w_handler_opts_set_option(handler_t* h, uint32_t option, void* value, int32_t* info); #endif \ No newline at end of file diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c index 78d66a0..7b91e9f 100644 --- a/src/kds_s2000w_net.c +++ b/src/kds_s2000w_net.c @@ -81,7 +81,7 @@ SANE_Status sane_kds_s2000w_net_open(SANE_String_Const devicename, if (handle == NULL) return SANE_STATUS_NO_MEM; - handler* h = (handler*) *handle; + handler_t* h = (handler_t*) *handle; if (h->state == NOTCONNECTED) { kds_s2000w_handler_free(h); @@ -104,7 +104,7 @@ void sane_kds_s2000w_net_close(SANE_Handle handle) { kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_close"); - const handler* h = (const handler*) handle; + const handler_t* h = (const handler_t*) handle; if (h == NULL || h->state != OPENED) return; @@ -125,7 +125,7 @@ SANE_Status sane_kds_s2000w_net_control_option(SANE_Handle handle, { kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_control_option"); - handler* h = (handler*) handle; + handler_t* h = (handler_t*) handle; if (action == SANE_ACTION_GET_VALUE) kds_s2000w_handler_opts_get_option(h, option, value, info); @@ -141,7 +141,7 @@ SANE_Status sane_kds_s2000w_net_get_parameters(SANE_Handle handle, { kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_get_parameters"); - handler* h = (handler*) handle; + handler_t* h = (handler_t*) handle; kds_s2000w_handler_get_current_metadata(h, (metadata_t*) params); @@ -153,7 +153,7 @@ SANE_Status sane_kds_s2000w_net_start(SANE_Handle handle) { kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_start"); - handler* h = (handler*) handle; + handler_t* h = (handler_t*) handle; if (h->scan_status->state == CANCLED) return SANE_STATUS_CANCELLED; @@ -190,7 +190,7 @@ SANE_Status sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data, { kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_read"); - handler* h = (handler*) handle; + handler_t* h = (handler_t*) handle; *length = h->image->size - h->scan_status->read_bytes; if (*length > max_length) @@ -215,7 +215,7 @@ void sane_kds_s2000w_net_cancel(SANE_Handle handle) { kds_s2000w_debug_printf(ALL, "sane_kds_s2000w_net_cancel"); - handler* h = (handler*) handle; + handler_t* h = (handler_t*) handle; if (h->scan_status->state == CANCLED) { kds_s2000w_debug_printf(DEBUG, "scan completed canceled"); diff --git a/tests/kds_s2000w_net_get_opt_tests.c b/tests/kds_s2000w_net_get_opt_tests.c index f1a4cd8..8ab887a 100644 --- a/tests/kds_s2000w_net_get_opt_tests.c +++ b/tests/kds_s2000w_net_get_opt_tests.c @@ -101,7 +101,7 @@ void sane_kds_s2000w_net_control_get_option_zero_test(void** state) will_return(__wrap_kds_s2000w_client_set_option, 0); expect_function_call(__wrap_kds_s2000w_client_get_option); expect_function_call(__wrap_kds_s2000w_client_set_option); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); int32_t value = 0; sane_kds_s2000w_net_control_option(h, 0, SANE_ACTION_GET_VALUE, &value, NULL); @@ -114,7 +114,7 @@ void sane_kds_s2000w_net_control_get_option_zero_test(void** state) void sane_kds_s2000w_net_control_get_option_two_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -129,7 +129,7 @@ void sane_kds_s2000w_net_control_get_option_two_test(void** state) void sane_kds_s2000w_net_control_get_option_three_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -144,7 +144,7 @@ void sane_kds_s2000w_net_control_get_option_three_test(void** state) void sane_kds_s2000w_net_control_get_option_four_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = 0; @@ -159,7 +159,7 @@ void sane_kds_s2000w_net_control_get_option_four_test(void** state) void sane_kds_s2000w_net_control_get_option_five_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -174,7 +174,7 @@ void sane_kds_s2000w_net_control_get_option_five_test(void** state) void sane_kds_s2000w_net_control_get_option_seven_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -189,7 +189,7 @@ void sane_kds_s2000w_net_control_get_option_seven_test(void** state) void sane_kds_s2000w_net_control_get_option_eight_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -204,7 +204,7 @@ void sane_kds_s2000w_net_control_get_option_eight_test(void** state) void sane_kds_s2000w_net_control_get_option_nine_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -219,7 +219,7 @@ void sane_kds_s2000w_net_control_get_option_nine_test(void** state) void sane_kds_s2000w_net_control_get_option_ten_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -234,7 +234,7 @@ void sane_kds_s2000w_net_control_get_option_ten_test(void** state) void sane_kds_s2000w_net_control_get_option_eleven_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -249,7 +249,7 @@ void sane_kds_s2000w_net_control_get_option_eleven_test(void** state) void sane_kds_s2000w_net_control_get_option_twelve_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -264,7 +264,7 @@ void sane_kds_s2000w_net_control_get_option_twelve_test(void** state) void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -279,7 +279,7 @@ void sane_kds_s2000w_net_control_get_option_fourteen_test(void** state) void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -294,7 +294,7 @@ void sane_kds_s2000w_net_control_get_option_fifteen_test(void** state) void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -309,7 +309,7 @@ void sane_kds_s2000w_net_control_get_option_sixteen_test(void** state) void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -324,7 +324,7 @@ void sane_kds_s2000w_net_control_get_option_seventeen_test(void** state) void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -339,7 +339,7 @@ void sane_kds_s2000w_net_control_get_option_nineteen_test(void** state) void sane_kds_s2000w_net_control_get_option_twenty_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -354,7 +354,7 @@ void sane_kds_s2000w_net_control_get_option_twenty_test(void** state) void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -369,7 +369,7 @@ void sane_kds_s2000w_net_control_get_option_twentyone_test(void** state) void sane_kds_s2000w_net_control_get_option_twentytwo_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -384,7 +384,7 @@ void sane_kds_s2000w_net_control_get_option_twentytwo_test(void** state) void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -399,7 +399,7 @@ void sane_kds_s2000w_net_control_get_option_twentythree_test(void** state) void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -414,7 +414,7 @@ void sane_kds_s2000w_net_control_get_option_twentyfour_test(void** state) void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -429,7 +429,7 @@ void sane_kds_s2000w_net_control_get_option_twentyfive_test(void** state) void sane_kds_s2000w_net_control_get_option_twentysix_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -444,7 +444,7 @@ void sane_kds_s2000w_net_control_get_option_twentysix_test(void** state) void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -459,7 +459,7 @@ void sane_kds_s2000w_net_control_get_option_twentyseven_test(void** state) void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -474,7 +474,7 @@ void sane_kds_s2000w_net_control_get_option_twentyeight_test(void** state) void sane_kds_s2000w_net_control_get_option_twentynine_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -489,7 +489,7 @@ void sane_kds_s2000w_net_control_get_option_twentynine_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdy_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -504,7 +504,7 @@ void sane_kds_s2000w_net_control_get_option_thirdy_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdythree_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); int32_t value = -1; @@ -519,7 +519,7 @@ void sane_kds_s2000w_net_control_get_option_thirdythree_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -534,7 +534,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyfour_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdyfive_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -549,7 +549,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyfive_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdysix_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -564,7 +564,7 @@ void sane_kds_s2000w_net_control_get_option_thirdysix_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -579,7 +579,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyseven_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -594,7 +594,7 @@ void sane_kds_s2000w_net_control_get_option_thirdyeight_test(void** state) void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -609,7 +609,7 @@ void sane_kds_s2000w_net_control_get_option_thirdynine_test(void** state) void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = 0; @@ -624,7 +624,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyone_test(void** state) void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -639,7 +639,7 @@ void sane_kds_s2000w_net_control_get_option_fourtytwo_test(void** state) void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -654,7 +654,7 @@ void sane_kds_s2000w_net_control_get_option_fourtythree_test(void** state) void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -669,7 +669,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyfour_test(void** state) void sane_kds_s2000w_net_control_get_option_fourtyfive_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; @@ -684,7 +684,7 @@ void sane_kds_s2000w_net_control_get_option_fourtyfive_test(void** state) void sane_kds_s2000w_net_control_get_option_fourtysix_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); uint32_t value = -1; @@ -699,7 +699,7 @@ void sane_kds_s2000w_net_control_get_option_fourtysix_test(void** state) void sane_kds_s2000w_net_control_get_option_fourtyseven_test(void** state) { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); response_t* resp = (response_t*) *state; h->scanner_config = json_tokener_parse(resp->data); char value[50] = {0}; diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c index e75450c..616eee6 100644 --- 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_test() { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); h->image->size = 65536; h->image->data = malloc(sizeof(char) * 65536); char* imagedata = (char*) h->image->data; @@ -66,7 +66,7 @@ void sane_kds_s2000w_net_read_test() void sane_kds_s2000w_net_read_without_data_test() { int32_t length = 0; - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); char* dataptr = malloc(sizeof(char)); SANE_Status status = sane_kds_s2000w_net_read(h, (void*) dataptr, 65536, &length); @@ -82,7 +82,7 @@ void sane_kds_s2000w_net_read_without_data_test() void sane_kds_s2000w_net_read_empty_image_test() { int32_t length = 0; - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); h->image->data = malloc(sizeof(char)); h->image->size = 0; char* dataptr = malloc(sizeof(char)); @@ -101,7 +101,7 @@ void sane_kds_s2000w_net_read_empty_image_test() void sane_kds_s2000w_net_read_bytes_per_line_bigger_test() { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); h->scan_status->read_bytes = 0; h->image->size = 95003; h->image->data = malloc(sizeof(char) * 95003); diff --git a/tests/kds_s2000w_net_tests.c b/tests/kds_s2000w_net_tests.c index 9013935..c343762 100644 --- a/tests/kds_s2000w_net_tests.c +++ b/tests/kds_s2000w_net_tests.c @@ -132,7 +132,7 @@ void kds_s2000w_net_get_devices_only_remote_test() void sane_kds_s2000w_net_get_parameter_color_test() { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); if (h == NULL) return; const char* config = "{\"Configuration\":{\"ColorMode\":\"Color\"}}"; @@ -188,7 +188,7 @@ void sane_kds_s2000w_net_get_parameter_color_test() void sane_kds_s2000w_net_get_parameter_bw_test() { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); if (h == NULL) return; const char* config = "{\"Configuration\":{\"ColorMode\":\"Color\"}}"; @@ -259,7 +259,7 @@ void sane_kds_s2000w_net_open_test() } SANE_Status status = sane_kds_s2000w_net_open("kds_s2000w_net", hlist); - handler* h = (handler*) *hlist; + handler_t* h = (handler_t*) *hlist; assert_int_equal(h->sessionid, 1251877821); assert_int_equal(status, SANE_STATUS_GOOD); @@ -351,7 +351,7 @@ void sane_kds_s2000w_net_start_test(void** state) expect_function_call(__wrap_kds_s2000w_client_status_session); expect_function_call(__wrap_kds_s2000w_client_get_image); expect_function_call(__wrap_kds_s2000w_client_delete_image); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }"; h->scanner_config = json_tokener_parse(test_config); @@ -396,7 +396,7 @@ void sane_kds_s2000w_net_start_one_page_per_flatscan_test(void** state) expect_function_call(__wrap_kds_s2000w_client_status_session); expect_function_call(__wrap_kds_s2000w_client_get_image); expect_function_call(__wrap_kds_s2000w_client_delete_image); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }"; h->scanner_config = json_tokener_parse(test_config); @@ -443,7 +443,7 @@ void sane_kds_s2000w_net_start_one_page_per_feeder_test(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); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }"; h->scanner_config = json_tokener_parse(test_config); @@ -491,7 +491,7 @@ void sane_kds_s2000w_net_start_two_pages_per_feeder_test(void** state) expect_function_call(__wrap_kds_s2000w_client_delete_image); expect_function_call(__wrap_kds_s2000w_client_stop_scan); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); const char* test_config = "{\"Configuration\": { \"ColorMode\": \"Color\" } }"; h->scanner_config = json_tokener_parse(test_config); @@ -561,7 +561,7 @@ void sane_kds_s2000w_net_cancel_test() will_return(__wrap_kds_s2000w_client_stop_scan, 0); expect_function_call(__wrap_kds_s2000w_client_status_session); expect_function_call(__wrap_kds_s2000w_client_stop_scan); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); h->scan_status->available_images = 1; sane_kds_s2000w_net_cancel(h); @@ -578,7 +578,7 @@ void sane_kds_s2000w_net_cancel_test() void sane_kds_s2000w_net_cancel_start_test() { - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); h->scan_status->state = CANCLED; SANE_Status status = sane_kds_s2000w_net_start(h); @@ -607,7 +607,7 @@ void sane_kds_s2000w_net_cancel_canceled_test() expect_function_call(__wrap_kds_s2000w_client_close_session); expect_function_call(__wrap_kds_s2000w_client_open_session); expect_function_call(__wrap_kds_s2000w_client_set_option); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); h->scan_status->state = CANCLED; sane_kds_s2000w_net_cancel(h); @@ -643,7 +643,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_feeder_test() will_return(__wrap_kds_s2000w_client_status_session, 0); expect_function_call(__wrap_kds_s2000w_client_status_session); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); sane_kds_s2000w_net_cancel(h); @@ -692,7 +692,7 @@ void sane_kds_s2000w_net_cancel_completed_scan_flatbed_test() expect_function_call(__wrap_kds_s2000w_client_open_session); expect_function_call(__wrap_kds_s2000w_client_set_option); - handler* h = kds_s2000w_handler_init(); + handler_t* h = kds_s2000w_handler_init(); sane_kds_s2000w_net_cancel(h);