Changeset 84994 in vbox for trunk/src/VBox/Runtime

Timestamp:

Jun 29, 2020 4:14:57 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

138889

Message:

IPRT/http: Consistently use CURLcode rcCurl;

File:

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

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

@@ -524 +524 @@
     if (pThis->cMaxRedirects != cMaxRedirects)
     {
-        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_MAXREDIRS, (long)cMaxRedirects);
+        CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_MAXREDIRS, (long)cMaxRedirects);
         AssertMsgReturn(rcCurl == CURLE_OK, ("CURLOPT_MAXREDIRS=%u: %d (%#x)\n", cMaxRedirects, rcCurl, rcCurl),
                         VERR_HTTP_CURL_ERROR);
@@ -578 +578 @@
                                    uint32_t uPort, const char *pszUsername, const char *pszPassword)
 {
-    int rcCurl;
+    CURLcode rcCurl;
     AssertReturn(pszHost, VERR_INVALID_PARAMETER);
     Log(("rtHttpUpdateProxyConfig: pThis=%p type=%d host='%s' port=%u user='%s'%s\n",
@@ -2078 +2078 @@
         if (pThis->fHaveSetUserAgent)
         {
-            int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_USERAGENT, (char *)NULL);
+            CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_USERAGENT, (char *)NULL);
             Assert(CURL_SUCCESS(rcCurl)); NOREF(rcCurl);
             pThis->fHaveSetUserAgent = false;
@@ -2166 +2166 @@
         pThis->pHeaders = &pHdr->Core;
 
-        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPHEADER, pThis->pHeaders);
+        CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPHEADER, pThis->pHeaders);
         if (CURL_SUCCESS(rcCurl))
             return rtHttpUpdateUserAgentHeader(pThis, pHdr);
@@ -2245 +2245 @@
     if (!pThis->pHeaders)
     {
-        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPHEADER, pHeaders);
+        CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPHEADER, pHeaders);
         if (CURL_FAILURE(rcCurl))
         {
@@ -2525 +2525 @@
                             pThis->pHeaders = &pHdr->Core;
 
-                            int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPHEADER, pThis->pHeaders);
+                            CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPHEADER, pThis->pHeaders);
                             if (CURL_SUCCESS(rcCurl))
                                 return VINF_SUCCESS;
@@ -2715 +2715 @@
     if (pThis->fVerifyPeer != fVerify)
     {
-        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_SSL_VERIFYPEER, (long)fVerify);
+        CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_SSL_VERIFYPEER, (long)fVerify);
         AssertMsgReturn(rcCurl == CURLE_OK, ("CURLOPT_SSL_VERIFYPEER=%RTbool: %d (%#x)\n", fVerify, rcCurl, rcCurl),
                         VERR_HTTP_CURL_ERROR);
@@ -2740 +2740 @@
  *                          the HTTP statuses are not translated to IPRT status codes.
  */
-static int rtHttpGetCalcStatus(PRTHTTPINTERNAL pThis, int rcCurl, uint32_t *puHttpStatus)
+static int rtHttpGetCalcStatus(PRTHTTPINTERNAL pThis, CURLcode rcCurl, uint32_t *puHttpStatus)
 {
     int rc = VERR_HTTP_CURL_ERROR;
@@ -2891 +2891 @@
      * The URL.
      */
-    int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_URL, pszUrl);
+    CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_URL, pszUrl);
     if (CURL_FAILURE(rcCurl))
         return VERR_INVALID_PARAMETER;
@@ -3364 +3364 @@
     {
         RT_ZERO(pThis->BodyOutput.uData.Mem);
-        int rcCurl = rtHttpSetWriteCallback(pThis, &rtHttpWriteBodyData, pThis);
+        CURLcode rcCurl = rtHttpSetWriteCallback(pThis, &rtHttpWriteBodyData, pThis);
         if (fNoBody)
         {
@@ -3505 +3505 @@
     {
         pThis->BodyOutput.uData.hFile = NIL_RTFILE;
-        int rcCurl = rtHttpSetWriteCallback(pThis, &rtHttpWriteDataToFile, (void *)&pThis->BodyOutput);
+        CURLcode rcCurl = rtHttpSetWriteCallback(pThis, &rtHttpWriteDataToFile, (void *)&pThis->BodyOutput);
         if (CURL_SUCCESS(rcCurl))
         {
@@ -3588 +3588 @@
     {
         /* Set the HTTP method. */
-        int rcCurl = 1;
+        CURLcode rcCurl = CURLE_BAD_FUNCTION_ARGUMENT;
         switch (enmMethod)
         {
@@ -3754 +3754 @@
     {
         AssertCompile(sizeof(curl_off_t) == sizeof(uint64_t));
-        int rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_INFILESIZE_LARGE, cbContent);
+        CURLcode rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_INFILESIZE_LARGE, cbContent);
         AssertMsgReturn(CURL_SUCCESS(rcCurl), ("%d (%#x)\n", rcCurl, rcCurl), VERR_HTTP_CURL_ERROR);
     }