change write direct to response

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index bf441ba9edf7da0655a0e84789646ba4ca039783..a56902d85bc3b439f1fa55f2fb9294a2177c642c 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -52,16 +52,6 @@ void _kds_s2000w_client_print_error_result(CURLcode result)
        kds_s2000w_debug_printf(ERROR, curl_easy_strerror(result));
 }
 
-void _kds_s2000w_client_stream_to_response(char* mem, response* resp, size_t* size)
-{
-       kds_s2000w_debug_printf(ALL, "kds_s2000w_client_stream_to_response");
-
-       size_t incl_null_term = *size + 1;
-       resp->data = malloc(sizeof(char) * incl_null_term);
-       resp->size = incl_null_term;
-       memcpy(resp->data, mem, incl_null_term);
-}
-
 void _kds_s2000w_client_set_ssl_verification_off(CURL* curl)
 {
        if (config->ssl_verify)
@@ -163,7 +153,7 @@ int kds_s2000w_client_open_session(response* resp)
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -173,8 +163,6 @@ int kds_s2000w_client_open_session(response* resp)
        body = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);
@@ -258,7 +246,7 @@ int kds_s2000w_client_get_capabilities(response* resp)
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -266,8 +254,6 @@ int kds_s2000w_client_get_capabilities(response* resp)
        headers = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);
@@ -318,7 +304,7 @@ int kds_s2000w_client_status_session(int64_t sessionid, response* resp)
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -326,8 +312,6 @@ int kds_s2000w_client_status_session(int64_t sessionid, response* resp)
        headers = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);
@@ -378,7 +362,7 @@ int kds_s2000w_client_start_scan(int64_t sessionid, response* resp)
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -386,8 +370,6 @@ int kds_s2000w_client_start_scan(int64_t sessionid, response* resp)
        headers = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);
@@ -438,7 +420,7 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* resp)
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -446,8 +428,6 @@ int kds_s2000w_client_stop_scan(int64_t sessionid, response* resp)
        headers = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);
@@ -500,7 +480,7 @@ int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* res
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -508,8 +488,6 @@ int kds_s2000w_client_get_image(int64_t sessionid, int img_number, response* res
        headers = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);
@@ -564,7 +542,7 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response*
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -574,8 +552,6 @@ int kds_s2000w_client_delete_image(int64_t sessionid, int img_number, response*
        headers = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);
@@ -625,7 +601,7 @@ int kds_s2000w_client_get_option(int64_t sessionid, response* resp)
 
        fclose(stream);
        stream = NULL;
-       _kds_s2000w_client_stream_to_response(*mem, resp, sizeloc);
+       resp->data = *mem;
 
        curl_url_cleanup(url_handler);
        url_handler = NULL;
@@ -633,8 +609,6 @@ int kds_s2000w_client_get_option(int64_t sessionid, response* resp)
        headers = NULL;
        curl_free(url);
        url = NULL;
-       free(*mem);
-       *mem = NULL;
        free(mem);
        mem = NULL;
        free(sizeloc);