Changeset 73834 in vbox

Timestamp:

Aug 22, 2018 3:51:01 PM (6 years ago)

Author:

vboxsync

Message:

http-curl.cpp: Use new CURLOPT_XFERINFOFUNCTION instead of old
deprecated CURLOPT_PROGRESSFUNCTION. The new one has integer
curl_off_t parameters instead of double. We are quite unlikely to run
into lost precision when converting from double, but it feels cleaner.

File:

• trunk/src/VBox/Runtime/generic/http-curl.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/generic/http-curl.cpp

@@ -2179 +2179 @@
  * cURL callback for reporting progress, we use it for checking for abort.
  */
-static int rtHttpProgress(void *pData, double rdTotalDownload, double rdDownloaded, double rdTotalUpload, double rdUploaded)
+static int rtHttpProgress(void *pData,
+                          curl_off_t rdTotalDownload, curl_off_t rdDownloaded,
+                          curl_off_t rdTotalUpload, curl_off_t rdUploaded)
 {
     PRTHTTPINTERNAL pThis = (PRTHTTPINTERNAL)pData;
@@ -2257 +2259 @@
      * Progress/abort.
      */
-    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROGRESSFUNCTION, &rtHttpProgress);
+    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_XFERINFOFUNCTION, &rtHttpProgress);
     if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
-    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PROGRESSDATA, (void *)pThis);
+    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_XFERINFODATA, (void *)pThis);
     if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;