Changeset 73839 in vbox for trunk/src

Timestamp:

Aug 22, 2018 4:45:17 PM (6 years ago)

Author:

vboxsync

Message:

http-curl.c: Factor out CURLcode rtHttpSetWriteCallback() and use it
both for the public RTHttpSetWriteCallback and internally. Fix
internal callbacks singatures to match FNRTHTTPWRITECALLBACK (i.e.
curl_write_callback) - the buffer parameter is char *, not void *.

No functional change intended.

File:

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

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

@@ -259 +259 @@
 static int rtHttpDarwinTryConfigProxies(PRTHTTPINTERNAL pThis, CFArrayRef hArrayProxies, CFURLRef hUrlTarget, bool fIgnorePacType);
 #endif
+static CURLcode rtHttpSetWriteCallback(PRTHTTPINTERNAL pThis, PFNRTHTTPWRITECALLBACK pfnWrite, void *pvUser);
 
 
@@ -2299 +2300 @@
  * cURL callback for writing data.
  */
-static size_t rtHttpWriteData(void *pvBuf, size_t cbUnit, size_t cUnits, void *pvUser)
+static size_t rtHttpWriteData(char *pcBuf, size_t cbUnit, size_t cUnits, void *pvUser)
 {
     PRTHTTPINTERNAL pThis = (PRTHTTPINTERNAL)pvUser;
@@ -2314 +2315 @@
         if (cbNewSize + 1 <= pThis->Output.Mem.cbAllocated)
         {
-            memcpy(&pThis->Output.Mem.pb[cbCurSize], pvBuf, cbToAppend);
+            memcpy(&pThis->Output.Mem.pb[cbCurSize], pcBuf, cbToAppend);
             pThis->Output.Mem.cb = cbNewSize;
             pThis->Output.Mem.pb[cbNewSize] = '\0';
@@ -2332 +2333 @@
         if (pbNew)
         {
-            memcpy(&pbNew[cbCurSize], pvBuf, cbToAppend);
+            memcpy(&pbNew[cbCurSize], pcBuf, cbToAppend);
             pbNew[cbNewSize] = '\0';
 
@@ -2402 +2403 @@
     {
         RT_ZERO(pThis->Output.Mem);
-        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEFUNCTION, &rtHttpWriteData);
-        if (!CURL_FAILURE(rcCurl))
-            rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEDATA, (void *)pThis);
+        int rcCurl = rtHttpSetWriteCallback(pThis, &rtHttpWriteData, (void *)pThis);
         if (fNoBody)
         {
@@ -2508 +2507 @@
  * cURL callback for writing data to a file.
  */
-static size_t rtHttpWriteDataToFile(void *pvBuf, size_t cbUnit, size_t cUnits, void *pvUser)
+static size_t rtHttpWriteDataToFile(char *pcBuf, size_t cbUnit, size_t cUnits, void *pvUser)
 {
     PRTHTTPINTERNAL pThis = (PRTHTTPINTERNAL)pvUser;
     size_t cbWritten = 0;
-    int rc = RTFileWrite(pThis->Output.hFile, pvBuf, cbUnit * cUnits, &cbWritten);
+    int rc = RTFileWrite(pThis->Output.hFile, pcBuf, cbUnit * cUnits, &cbWritten);
     if (RT_SUCCESS(rc))
         return cbWritten;
@@ -2544 +2543 @@
     {
         pThis->Output.hFile = NIL_RTFILE;
-        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEFUNCTION, &rtHttpWriteDataToFile);
-        if (!CURL_FAILURE(rcCurl))
-            rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEDATA, (void *)pThis);
+        int rcCurl = rtHttpSetWriteCallback(pThis, &rtHttpWriteDataToFile, (void *)pThis);
         if (!CURL_FAILURE(rcCurl))
         {
@@ -2609 +2606 @@
 
 
+static CURLcode rtHttpSetWriteCallback(PRTHTTPINTERNAL pThis, PFNRTHTTPWRITECALLBACK pfnWrite, void *pvUser)
+{
+    CURLcode rcCurl;
+
+    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEFUNCTION, pfnWrite);
+    if (CURL_FAILURE(rcCurl))
+        return rcCurl;
+
+    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEDATA, pvUser);
+    if (CURL_FAILURE(rcCurl))
+        return rcCurl;
+
+    return rcCurl;
+}
+
+
 RTR3DECL(int) RTHttpSetWriteCallback(RTHTTP hHttp, PFNRTHTTPWRITECALLBACK pfnWrite, void *pvUser)
 {
-    CURLcode rcCurl;
-
     PRTHTTPINTERNAL pThis = hHttp;
     RTHTTP_VALID_RETURN(pThis);
 
-    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEFUNCTION, pfnWrite);
-    if (CURL_FAILURE(rcCurl))
-        return VERR_HTTP_CURL_ERROR;
-
-    rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEDATA, pvUser);
+    CURLcode rcCurl = rtHttpSetWriteCallback(pThis, pfnWrite, pvUser);
     if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;