okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the wonky fix to the wonky va_list usage

Browse source
This commit is contained in:
Tim Angus 2015-09-09 23:33:36 +01:00
parent 566e2a18de
commit ec6916ded5
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
code/client/cl_curl.c
View file

@ -217,25 +217,27 @@ static size_t CL_cURL_CallbackWrite(void *buffer, size_t size, size_t nmemb,
return size*nmemb; return size*nmemb;
} }
static CURLcode qcurl_easy_setopt_warn_valist(CURL *curl, CURLoption option, va_list args)
{
CURLcode result;
result = qcurl_easy_setopt(curl, option, args);
if(result != CURLE_OK) {
Com_DPrintf("qcurl_easy_setopt failed: %s\n", qcurl_easy_strerror(result));
}
return result;
}
CURLcode qcurl_easy_setopt_warn(CURL *curl, CURLoption option, ...) CURLcode qcurl_easy_setopt_warn(CURL *curl, CURLoption option, ...)
{ {
CURLcode result; CURLcode result;
va_list argp; va_list argp;
va_start(argp, option); va_start(argp, option);
result = qcurl_easy_setopt_warn_valist(curl, option, argp);
if(option < CURLOPTTYPE_OBJECTPOINT) {
long longValue = va_arg(argp, long);
result = qcurl_easy_setopt_warn(curl, option, longValue);
} else if(option < CURLOPTTYPE_OFF_T) {
void *pointerValue = va_arg(argp, void *);
result = qcurl_easy_setopt_warn(curl, option, pointerValue);
} else {
curl_off_t offsetValue = va_arg(argp, curl_off_t);
result = qcurl_easy_setopt_warn(curl, option, offsetValue);
}
if(result != CURLE_OK) {
Com_DPrintf("qcurl_easy_setopt failed: %s\n", qcurl_easy_strerror(result));
}
va_end(argp); va_end(argp);
return result; return result;