qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qw] Update http_progress for recent curl

Browse source 
CURLOPT_PROGRESSFUNCTION was deprecated in favor of
CURLOPT_XFERINFOFUNCTION (and the parameters for the callback adjusted).
I'm not sure why this didn't trigger until now.
This commit is contained in:
Bill Currie 2023-02-13 12:41:52 +09:00
parent 6f429311c9
commit d59dcba37d
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qw/source/cl_http.c
View file

@ -47,8 +47,8 @@ static CURL *easy_handle;
static CURLM *multi_handle; static CURLM *multi_handle;
static int static int
http_progress (void *clientp, double dltotal, double dlnow, http_progress (void *clientp, curl_off_t dltotal, curl_off_t dlnow,
double ultotal, double uplow) curl_off_t ultotal, curl_off_t uplow)
{ {
return 0; //non-zero = abort return 0; //non-zero = abort
} }
@ -87,7 +87,7 @@ CL_HTTP_StartDownload (void)
curl_easy_setopt (easy_handle, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt (easy_handle, CURLOPT_NOPROGRESS, 1L);
curl_easy_setopt (easy_handle, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (easy_handle, CURLOPT_NOSIGNAL, 1L);
curl_easy_setopt (easy_handle, CURLOPT_PROGRESSFUNCTION, http_progress); curl_easy_setopt (easy_handle, CURLOPT_XFERINFOFUNCTION, http_progress);
curl_easy_setopt (easy_handle, CURLOPT_WRITEFUNCTION, http_write); curl_easy_setopt (easy_handle, CURLOPT_WRITEFUNCTION, http_write);
curl_easy_setopt (easy_handle, CURLOPT_URL, cls.downloadurl->str); curl_easy_setopt (easy_handle, CURLOPT_URL, cls.downloadurl->str);