From 8ecd46207f945554f44842a40d97b9b5e92396d1 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Thu, 29 Feb 2024 16:51:28 +0100 Subject: [PATCH] refactor response only in methods --- src/kds_s2000w_handler.c | 17 +++++++---------- src/kds_s2000w_handler_opts.c | 7 +++---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c index 003a0ec..f78d0cd 100644 --- a/src/kds_s2000w_handler.c +++ b/src/kds_s2000w_handler.c @@ -9,7 +9,6 @@ #include "kds_s2000w_image_converter.h" #include "kds_s2000w_debug.h" -response* resp = NULL; json_object* resp_config = NULL; json_object* config = NULL; blobdata image; @@ -18,7 +17,7 @@ blobdata pnm_image; void _get_current_metadata(handler* h) { debug_printf(ALL, "get_current_metadata"); - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_get_metadata(h->sessionid, h->current_scan_status->current_image_number, resp); if (resp->code != 200) { debug_printf_int(ERROR, "metadata response code", resp->code); @@ -103,7 +102,7 @@ void _get_current_metadata(handler* h) void _delete_current_image(handler* h) { debug_printf(ALL, "delete_current_image"); - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_delete_image(h->sessionid, h->current_scan_status->current_image_number, resp); if (resp->code != 200) debug_printf_int(ERROR, "delete current image response code", resp->code); @@ -121,7 +120,7 @@ void _download_current_image(handler* h) image.data = NULL; image.size = 0; } - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_get_image(h->sessionid, h->current_scan_status->current_image_number, resp); if (resp->code != 200) debug_printf_int(ERROR, "download current image response code", resp->code); @@ -141,7 +140,7 @@ void _get_current_scan_status(handler* h) json_object* status_obj = NULL; json_object* status_value_obj = NULL; - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_status_session(h->sessionid, resp); if (resp->code != 200) debug_printf_int(ERROR, "get current scan status response code", resp->code); @@ -253,7 +252,7 @@ void kds_s2000w_handler_open(const char* devicename, void** handle) pnm_image.size = 0; pnm_image.data = NULL; - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); int result = kds_s2000w_client_open_session("hhaalo", resp); if (resp->code == 408) { @@ -298,8 +297,6 @@ void kds_s2000w_handler_close(handler* h) debug_printf(ALL, "kds_s2000w_handler_close"); json_object_put(resp_config); resp_config = NULL; - kds_s2000w_client_response_free(resp); - resp = NULL; free(image.data); image.data = NULL; @@ -315,7 +312,7 @@ void kds_s2000w_handler_close(handler* h) void kds_s2000w_handler_start_scan(handler* h) { debug_printf(ALL, "kds_s2000w_handler_start_scan"); - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_start_scan(h->sessionid, resp); if (resp->code != 200) debug_printf_int(ERROR, "start scan response code", resp->code); @@ -327,7 +324,7 @@ void kds_s2000w_handler_start_scan(handler* h) void kds_s2000w_handler_stop_scan(handler* h) { debug_printf(ALL, "kds_s2000w_handler_stop_scan"); - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_stop_scan(h->sessionid, resp); if (resp->code != 200) debug_printf_int(ERROR, "stop scan response code", resp->code); diff --git a/src/kds_s2000w_handler_opts.c b/src/kds_s2000w_handler_opts.c index 4e7243e..fe136f6 100644 --- a/src/kds_s2000w_handler_opts.c +++ b/src/kds_s2000w_handler_opts.c @@ -7,7 +7,6 @@ #define COUNT_CUSTOM_OPTIONS 8 -extern response* resp; extern json_object* resp_config; extern json_object* config; int gamma_table[4][256]; @@ -43,7 +42,7 @@ void _load_options(handler* h) json_object_put(resp_config); resp_config = NULL; - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); int result = kds_s2000w_client_get_option(h->sessionid, resp); resp_config = json_tokener_parse(resp->data); config = json_object_object_get(resp_config, "Configuration"); @@ -366,7 +365,7 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf _write_string_value_to_json(value_object, value); break; case 24: - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); kds_s2000w_client_get_capabilities(resp); json_object* capabilities = json_tokener_parse(resp->data); json_object* default_values = json_object_object_get(capabilities, "Defaults"); @@ -408,7 +407,7 @@ void kds_s2000w_handler_set_option(handler* h, int option, void* value, int* inf } const char* json_string = json_object_to_json_string_ext(resp_config, JSON_C_TO_STRING_PLAIN); - resp = kds_s2000w_client_response_init(); + response* resp = kds_s2000w_client_response_init(); resp->size = sizeof(char) * strlen(json_string); resp->code = 0; resp->data = realloc(resp->data, resp->size); -- 2.39.5