Changeset 85162 in vbox for trunk/src/VBox/Runtime/generic

Timestamp:

Jul 10, 2020 9:53:05 AM (5 years ago)

Author:

vboxsync

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

139126

Message:

IPRT/http-curl.cpp: Deprecated function, missing RT_NOTHROW_DEF. bugref:9790 bugref:9794

File:

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

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

@@ -1155 +1155 @@
 static CFURLRef rtHttpDarwinUrlToCFURL(const char *pszUrl)
 {
+    /* CFURLCreateStringByAddingPercentEscapes is deprecated, so try use CFURLCreateWithBytes
+       as it doesn't validate as much as as CFUrlCreateWithString does. */
+#if 0
     CFURLRef    hUrl = NULL;
     CFStringRef hStrUrl = CFStringCreateWithCString(kCFAllocatorDefault, pszUrl, kCFStringEncodingUTF8);
@@ -1175 +1178 @@
     else
         AssertFailed();
+#else
+    CFURLRef hUrl = CFURLCreateWithBytes(kCFAllocatorDefault, (const uint8_t *)pszUrl, strlen(pszUrl),
+                                         kCFStringEncodingUTF8, NULL /*baseURL*/);
+    Assert(hUrl);
+#endif
     return hUrl;
 }
@@ -1528 +1536 @@
     /* Work around for <rdar://problem/5530166>, whatever that is.  Initializes
        some internal CFNetwork state, they say.  See CFPRoxySupportTool example. */
-    hArray = CFNetworkCopyProxiesForURL(hUrlTarget, NULL);
+    CFDictionaryRef hDictNull = (CFDictionaryRef)(42-42); /*workaround for -Wnonnull warning in Clang 11. */
+    hArray = CFNetworkCopyProxiesForURL(hUrlTarget, hDictNull);
     if (hArray)
         CFRelease(hArray);
@@ -3122 +3131 @@
  * cURL callback for writing header data.
  */
-static size_t rtHttpWriteHeaderData(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser)
+static size_t rtHttpWriteHeaderData(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser) RT_NOTHROW_DEF
 {
     PRTHTTPINTERNAL   pThis      = (PRTHTTPINTERNAL)pvUser;
@@ -3210 +3219 @@
  * cURL callback for working the upload callback.
  */
-static size_t rtHttpWriteDataToDownloadCallback(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser)
+static size_t rtHttpWriteDataToDownloadCallback(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser) RT_NOTHROW_DEF
 {
     PRTHTTPINTERNAL   pThis = (PRTHTTPINTERNAL)pvUser;
@@ -3243 +3252 @@
  * Callback feeding cURL data from RTHTTPINTERNAL::ReadData::Mem.
  */
-static size_t rtHttpReadData(void *pvDst, size_t cbUnit, size_t cUnits, void *pvUser)
+static size_t rtHttpReadData(void *pvDst, size_t cbUnit, size_t cUnits, void *pvUser) RT_NOTHROW_DEF
 {
     PRTHTTPINTERNAL pThis = (PRTHTTPINTERNAL)pvUser;
@@ -3260 +3269 @@
  * Callback feeding cURL data via the user upload callback.
  */
-static size_t rtHttpReadDataFromUploadCallback(void *pvDst, size_t cbUnit, size_t cUnits, void *pvUser)
+static size_t rtHttpReadDataFromUploadCallback(void *pvDst, size_t cbUnit, size_t cUnits, void *pvUser) RT_NOTHROW_DEF
 {
     PRTHTTPINTERNAL pThis = (PRTHTTPINTERNAL)pvUser;
@@ -3478 +3487 @@
  * cURL callback for writing data to a file.
  */
-static size_t rtHttpWriteDataToFile(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser)
+static size_t rtHttpWriteDataToFile(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser) RT_NOTHROW_DEF
 {
     RTHTTPOUTPUTDATA *pOutput   = (RTHTTPOUTPUTDATA *)pvUser;