From 5e6c43f3bdde29fefdd67fe49b958e0c85911335 Mon Sep 17 00:00:00 2001 From: Fufu Fang Date: Tue, 24 Jul 2018 04:57:53 +0100 Subject: [PATCH] changed variable type to transfer struct --- network.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/network.c b/network.c index 998da4f..d854c5d 100644 --- a/network.c +++ b/network.c @@ -87,8 +87,9 @@ static void nonblocking_transfer(CURL *curl, TransferStruct *transfer) /* This uses the curl multi interface */ static void blocking_transfer(CURL *curl) { - volatile int transferring = 1; - curl_easy_setopt(curl, CURLOPT_PRIVATE, &transferring); + volatile TransferStruct transfer; + transfer.transferring = 1; + curl_easy_setopt(curl, CURLOPT_PRIVATE, &transfer); CURLMcode res = curl_multi_add_handle(curl_multi, curl); if(res > 0) { fprintf(stderr, "blocking_multi_transfer(): %d, %s\n", @@ -96,7 +97,7 @@ static void blocking_transfer(CURL *curl) exit(EXIT_FAILURE); } - while (transferring) { + while (transfer.transferring) { curl_multi_perform_once(); } } @@ -159,11 +160,11 @@ static int curl_multi_perform_once() CURLMsg *curl_msg; while((curl_msg = curl_multi_info_read(curl_multi, &n_mesgs))) { if (curl_msg->msg == CURLMSG_DONE) { - int *transferring; + TransferStruct *transfer; CURL *curl = curl_msg->easy_handle; curl_easy_getinfo(curl_msg->easy_handle, CURLINFO_PRIVATE, - &transferring); - *transferring = 0; + &transfer); + transfer->transferring = 0; char *url = NULL; if (curl_msg->data.result) { curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, url);