rdelaage
/
httpdirfs
mirror of https://github.com/fangfufu/httpdirfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed variable type to transfer struct

This commit is contained in:
Fufu Fang 2018-07-24 04:57:53 +01:00
parent d82bf65ddc
commit 5e6c43f3bd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
network.c
View File

@ -87,8 +87,9 @@ static void nonblocking_transfer(CURL *curl, TransferStruct *transfer)
/* This uses the curl multi interface */ /* This uses the curl multi interface */
static void blocking_transfer(CURL *curl) static void blocking_transfer(CURL *curl)
{ {
volatile int transferring = 1; volatile TransferStruct transfer;
curl_easy_setopt(curl, CURLOPT_PRIVATE, &transferring); transfer.transferring = 1;
curl_easy_setopt(curl, CURLOPT_PRIVATE, &transfer);
CURLMcode res = curl_multi_add_handle(curl_multi, curl); CURLMcode res = curl_multi_add_handle(curl_multi, curl);
if(res > 0) { if(res > 0) {
fprintf(stderr, "blocking_multi_transfer(): %d, %s\n", fprintf(stderr, "blocking_multi_transfer(): %d, %s\n",
@ -96,7 +97,7 @@ static void blocking_transfer(CURL *curl)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
while (transferring) { while (transfer.transferring) {
curl_multi_perform_once(); curl_multi_perform_once();
} }
} }
@ -159,11 +160,11 @@ static int curl_multi_perform_once()
CURLMsg *curl_msg; CURLMsg *curl_msg;
while((curl_msg = curl_multi_info_read(curl_multi, &n_mesgs))) { while((curl_msg = curl_multi_info_read(curl_multi, &n_mesgs))) {
if (curl_msg->msg == CURLMSG_DONE) { if (curl_msg->msg == CURLMSG_DONE) {
int *transferring; TransferStruct *transfer;
CURL *curl = curl_msg->easy_handle; CURL *curl = curl_msg->easy_handle;
curl_easy_getinfo(curl_msg->easy_handle, CURLINFO_PRIVATE, curl_easy_getinfo(curl_msg->easy_handle, CURLINFO_PRIVATE,
&transferring); &transfer);
*transferring = 0; transfer->transferring = 0;
char *url = NULL; char *url = NULL;
if (curl_msg->data.result) { if (curl_msg->data.result) {
curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, url); curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, url);