From 567bd2a84a3a385342aaad301771dd26e9b128ea Mon Sep 17 00:00:00 2001 From: James R Date: Mon, 9 Jan 2023 19:32:28 -0800 Subject: [PATCH] d_netfil: use CURLOPT_XFERINFOFUNCTION Fixes deprecated warning since libcurl 7.32.0 (2013-08-12). --- src/d_netfil.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/d_netfil.c b/src/d_netfil.c index 5d99493de..3723ca75b 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -69,7 +69,7 @@ static boolean AddFileToSendQueue(INT32 node, const char *filename, UINT8 fileid #ifdef HAVE_CURL size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream); -int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow); +int curlprogress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow); #endif // Sender structure @@ -131,8 +131,8 @@ static CURL *http_handle; static CURLM *multi_handle; boolean curl_running = false; boolean curl_failedwebdownload = false; -static double curl_dlnow; -static double curl_dltotal; +static curl_off_t curl_dlnow; +static curl_off_t curl_dltotal; static time_t curl_starttime; INT32 curl_transfers = 0; static int curl_runninghandles = 0; @@ -1771,7 +1771,7 @@ size_t curlwrite_data(void *ptr, size_t size, size_t nmemb, FILE *stream) return written; } -int curlprogress_callback(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) +int curlprogress_callback(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow) { (void)clientp; (void)ultotal; @@ -1834,7 +1834,7 @@ void CURLPrepareFile(const char* url, int dfilenum) curl_easy_setopt(http_handle, CURLOPT_WRITEDATA, curl_curfile->file); curl_easy_setopt(http_handle, CURLOPT_WRITEFUNCTION, curlwrite_data); curl_easy_setopt(http_handle, CURLOPT_NOPROGRESS, 0L); - curl_easy_setopt(http_handle, CURLOPT_PROGRESSFUNCTION, curlprogress_callback); + curl_easy_setopt(http_handle, CURLOPT_XFERINFOFUNCTION, curlprogress_callback); curl_curfile->status = FS_DOWNLOADING; lastfilenum = dfilenum;