From ec6916ded5574a98708418742ff0615a0218b8e4 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Wed, 9 Sep 2015 23:33:36 +0100
Subject: [PATCH] Fix the wonky fix to the wonky va_list usage

---
 code/client/cl_curl.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/client/cl_curl.c b/code/client/cl_curl.c
index 4761a115..165bd37a 100644
--- a/code/client/cl_curl.c
+++ b/code/client/cl_curl.c
@@ -217,25 +217,27 @@ static size_t CL_cURL_CallbackWrite(void *buffer, size_t size, size_t 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 result;
 
 	va_list argp;
 	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);
 
 	return result;