Changeset 73837 in vbox

Timestamp:

Aug 22, 2018 4:04:24 PM (6 years ago)

Author:

vboxsync

Message:

http-curl.cpp: Use CURL_FAILURE() macro in the new code.

File:

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

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

@@ -2598 +2598 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_READFUNCTION, pfnRead);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_READDATA, pvUser);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2617 +2617 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEFUNCTION, pfnWrite);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_WRITEDATA, pvUser);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2636 +2636 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HEADERFUNCTION, pfnWrite);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HEADERDATA, pvUser);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2655 +2655 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_URL, pszUrl);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2670 +2670 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPGET, 1L);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2685 +2685 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_HTTPGET, 1L);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_NOBODY, 1L);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2704 +2704 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_POST, 1L);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2719 +2719 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_PUT, 1L);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2741 +2741 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_CUSTOMREQUEST, pszVerb);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2756 +2756 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_POSTFIELDSIZE, cb);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_POSTFIELDS, pv);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2774 +2774 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_INFILESIZE_LARGE, cb);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2789 +2789 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_VERBOSE, fValue ? 1L : 0L);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2804 +2804 @@
 
     rcCurl = curl_easy_setopt(pThis->pCurl, CURLOPT_TIMEOUT, sec);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2819 +2819 @@
 
     rcCurl = curl_easy_perform(pThis->pCurl);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;
 
@@ -2835 +2835 @@
 
     rcCurl = curl_easy_getinfo(pThis->pCurl, CURLINFO_RESPONSE_CODE, plCode);
-    if (rcCurl != CURLE_OK)
+    if (CURL_FAILURE(rcCurl))
         return VERR_HTTP_CURL_ERROR;