rename global client var

diff --git a/src/kds_s2000w_client.c b/src/kds_s2000w_client.c
index d5efb47082d6d1c8b63a4b95b31cd91fdbe8dc49..8477524c0b24d3e678addb7bbf6c98a130a0b47e 100644 (file)
--- a/src/kds_s2000w_client.c
+++ b/src/kds_s2000w_client.c
@@ -24,7 +24,7 @@
 #define CAPABILITIES_VERSION_2 "v2"
 #define CONFIGURATION_PATH "/api/session/configuration"
 
-client_config_t* client_config = NULL;
+client_config_t* kds_s2000w_client_config = NULL;
 
 typedef struct {
        CURL* curl;
@@ -119,7 +119,7 @@ void _kds_s2000w_client_print_error_result(const CURLcode result, const char* er
 
 void _kds_s2000w_client_set_ssl_verification_off(CURL* curl)
 {
-       if (client_config->ssl_verify)
+       if (kds_s2000w_client_config->ssl_verify)
                return;
 
        curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
@@ -208,7 +208,7 @@ char* _kds_s2000w_client_get_username_body()
                return NULL;
 
        memset(body, 0, MAX_STR_BUFFER_LENGTH);
-       sprintf(body, "{\"OCPUserName\": \"%s\"}", client_config->username);
+       sprintf(body, "{\"OCPUserName\": \"%s\"}", kds_s2000w_client_config->username);
        char* tmp_body = realloc(body, sizeof(char*) * (strlen(body) + 1));
        if (tmp_body == NULL) {
                free(body);
@@ -243,11 +243,11 @@ void kds_s2000w_client_init(const client_config_t* config)
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_init");
 
-       client_config = malloc(sizeof(client_config_t));
-       client_config->scanner_url = _kds_s2000w_client_strdup(config->scanner_url);
-       client_config->username = _kds_s2000w_client_strdup(config->username);
-       client_config->ssl_verify = config->ssl_verify;
-       client_config->heartbeat = config->heartbeat;
+       kds_s2000w_client_config = malloc(sizeof(client_config_t));
+       kds_s2000w_client_config->scanner_url = _kds_s2000w_client_strdup(config->scanner_url);
+       kds_s2000w_client_config->username = _kds_s2000w_client_strdup(config->username);
+       kds_s2000w_client_config->ssl_verify = config->ssl_verify;
+       kds_s2000w_client_config->heartbeat = config->heartbeat;
        curl_global_init(CURL_GLOBAL_ALL);
 }
 
@@ -255,12 +255,12 @@ void kds_s2000w_client_free()
 {
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_free");
 
-       free(client_config->scanner_url);
-       client_config->scanner_url = NULL;
-       free(client_config->username);
-       client_config->username = NULL;
-       free(client_config);
-       client_config = NULL;
+       free(kds_s2000w_client_config->scanner_url);
+       kds_s2000w_client_config->scanner_url = NULL;
+       free(kds_s2000w_client_config->username);
+       kds_s2000w_client_config->username = NULL;
+       free(kds_s2000w_client_config);
+       kds_s2000w_client_config = NULL;
        curl_global_cleanup();
 }
 
@@ -299,7 +299,7 @@ uint8_t kds_s2000w_client_open_session(response_t* resp)
        if (param == NULL)
                return CURLE_OUT_OF_MEMORY;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, SESSION_PATH, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -336,7 +336,7 @@ void kds_s2000w_client_close_session(int64_t sessionid)
        if (param == NULL)
                return;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, SESSION_PATH, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -358,7 +358,7 @@ uint8_t kds_s2000w_client_get_capabilities(response_t* resp)
        if (param == NULL)
                return CURLE_OUT_OF_MEMORY;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, CAPABILITIES_PATH, 0);
        curl_url_set(param->url_handler, CURLUPART_QUERY, CAPABILITIES_VERSION_2, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
@@ -383,13 +383,13 @@ uint8_t kds_s2000w_client_status_session(int64_t sessionid, response_t* resp)
        kds_s2000w_debug_printf(ALL, "kds_s2000w_client_status_session");
 
        kds_s2000w_heartbeat_join_thread();
-       kds_s2000w_heartbeat_wait_seconds(&client_config->heartbeat);
+       kds_s2000w_heartbeat_wait_seconds(&kds_s2000w_client_config->heartbeat);
 
        curl_param_t* param = _kds_s2000w_client_param_init(sessionid);
        if (param == NULL)
                return CURLE_OUT_OF_MEMORY;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, STATUS_PATH, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -416,7 +416,7 @@ uint8_t kds_s2000w_client_start_scan(int64_t sessionid)
        if (param == NULL)
                return CURLE_OUT_OF_MEMORY;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, STARTSCAN_PATH, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -442,7 +442,7 @@ uint8_t kds_s2000w_client_stop_scan(int64_t sessionid)
        if (param == NULL)
                return CURLE_OUT_OF_MEMORY;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, STOPSCAN_PATH, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -469,7 +469,7 @@ uint8_t kds_s2000w_client_get_image(int64_t sessionid, uint8_t img_number, respo
                return CURLE_OUT_OF_MEMORY;
 
        char* url_path = _kds_s2000w_client_append_image_number_to_str(img_number, IMAGE_PATH);
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, url_path, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -498,7 +498,7 @@ uint8_t kds_s2000w_client_delete_image(int64_t sessionid, uint8_t img_number)
                return CURLE_OUT_OF_MEMORY;
 
        char* url_path = _kds_s2000w_client_append_image_number_to_str(img_number, IMAGE_PATH);
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, url_path, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -525,7 +525,7 @@ uint8_t kds_s2000w_client_get_option(int64_t sessionid, response_t* resp)
        if (param == NULL)
                return CURLE_OUT_OF_MEMORY;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, CONFIGURATION_PATH, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);
@@ -552,7 +552,7 @@ uint8_t kds_s2000w_client_set_option(int64_t sessionid, response_t* resp)
        if (param == NULL)
                return CURLE_OUT_OF_MEMORY;
 
-       curl_url_set(param->url_handler, CURLUPART_URL, client_config->scanner_url, 0);
+       curl_url_set(param->url_handler, CURLUPART_URL, kds_s2000w_client_config->scanner_url, 0);
        curl_url_set(param->url_handler, CURLUPART_PATH, CONFIGURATION_PATH, 0);
        curl_url_get(param->url_handler, CURLUPART_URL, &param->url, 0);
        curl_easy_setopt(param->curl, CURLOPT_URL, param->url);