vbox的更動 62635 路徑 trunk/src/VBox/Runtime

時間撮記:

2016-7-28 下午04:42:06 (8 年 以前)

作者:

vboxsync

訊息:

warnings

位置:

trunk/src/VBox/Runtime

檔案:

• VBox/VBoxRTDeps.cpp (修改) (1 筆差異)
• common/misc/s3.cpp (修改) (1 筆差異)
• generic/http-curl.cpp (修改) (6 筆差異)
• r3/win/dllmain-win.cpp (修改) (1 筆差異)
• r3/win/fileaio-win.cpp (修改) (4 筆差異)
• r3/xml.cpp (修改) (3 筆差異)

trunk/src/VBox/Runtime/VBox/VBoxRTDeps.cpp

@@ -42 +42 @@
 #include <openssl/md5.h>
 #include <openssl/rc4.h>
-#include <openssl/pem.h>
+#ifdef RT_OS_WINDOWS
+# include <iprt/win/windows.h>
+#endif
+#include <openssl/pem.h> /* drags in Windows.h */
 #include <openssl/x509.h>
 #include <openssl/rsa.h>

trunk/src/VBox/Runtime/common/misc/s3.cpp

@@ -39 +39 @@
 #include <iprt/stream.h>
 
+#ifdef RT_OS_WINDOWS /* OpenSSL drags in Windows.h, which isn't compatible with -Wall.  */
+# include <iprt/win/windows.h>
+#endif
 #include <curl/curl.h>
 #include <openssl/hmac.h>

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

@@ -54 +54 @@
 #include "internal/magics.h"
 
+#ifdef RT_OS_WINDOWS /* curl.h drags in windows.h which isn't necessarily -Wall clean. */
+# include <iprt/win/windows.h>
+#endif
 #include <curl/curl.h>
 
@@ -1424 +1427 @@
          * special "<local>" entry matches anything without a dot.
          */
-        RTNETADDRU  HostAddr;
+        RTNETADDRU  HostAddr = { 0, 0 };
         int         fIsHostIpv4Address = -1;
         char *pszEntry = pszBypassFree;
@@ -1554 +1557 @@
             if (pszEqual)
             {
-                if (   pszEqual - pszEntry == cchUrlScheme
+                if (   (uintptr_t)(pszEqual - pszEntry) == cchUrlScheme
                     && RTStrNICmp(pszEntry, pszUrlScheme, cchUrlScheme) == 0)
                 {
@@ -1564 +1567 @@
             {
                 bool fSchemeMatch = pszEndOfScheme
-                                 && pszEndOfScheme - pszEntry == cchUrlScheme
+                                 && (uintptr_t)(pszEndOfScheme - pszEntry) == cchUrlScheme
                                  && RTStrNICmp(pszEntry, pszUrlScheme, cchUrlScheme) == 0;
                 if (   !pszBestEntry
@@ -1621 +1624 @@
          */
         WINHTTP_PROXY_INFO          ProxyInfo;
-        PRTUTF16                    pwszProxy = NULL;
-        PRTUTF16                    pwszNoProxy = NULL;
         WINHTTP_AUTOPROXY_OPTIONS   AutoProxyOptions;
         RT_ZERO(AutoProxyOptions);
@@ -1873 +1874 @@
         if (pThis->fDeleteCaFile)
         {
-            int rc2 = RTFileDelete(pThis->pszCaFile);
+            int rc2 = RTFileDelete(pThis->pszCaFile); RT_NOREF_PV(rc2);
             AssertMsg(RT_SUCCESS(rc2) || !RTFileExists(pThis->pszCaFile), ("rc=%Rrc '%s'\n", rc2, pThis->pszCaFile));
         }

trunk/src/VBox/Runtime/r3/win/dllmain-win.cpp

@@ -41 +41 @@
 BOOL __stdcall DllMain(HANDLE hModule, DWORD dwReason, PVOID pvReserved)
 {
+    RT_NOREF_PV(pvReserved);
+
     switch (dwReason)
     {

trunk/src/VBox/Runtime/r3/win/fileaio-win.cpp

@@ -126 +126 @@
 RTR3DECL(int) RTFileAioGetLimits(PRTFILEAIOLIMITS pAioLimits)
 {
-    int rcBSD = 0;
     AssertPtrReturn(pAioLimits, VERR_INVALID_POINTER);
 
@@ -224 +223 @@
     RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
     AssertReturn(hFile != NIL_RTFILE, VERR_INVALID_HANDLE);
+    RT_NOREF_PV(pvUser);
 
     return VERR_NOT_SUPPORTED;
@@ -271 +271 @@
 }
 
-RTDECL(int) RTFileAioCtxCreate(PRTFILEAIOCTX phAioCtx, uint32_t cAioReqsMax,
-                               uint32_t fFlags)
+RTDECL(int) RTFileAioCtxCreate(PRTFILEAIOCTX phAioCtx, uint32_t cAioReqsMax, uint32_t fFlags)
 {
     PRTFILEAIOCTXINTERNAL pCtxInt;
     AssertPtrReturn(phAioCtx, VERR_INVALID_POINTER);
     AssertReturn(!(fFlags & ~RTFILEAIOCTX_FLAGS_VALID_MASK), VERR_INVALID_PARAMETER);
+    RT_NOREF_PV(cAioReqsMax);
 
     pCtxInt = (PRTFILEAIOCTXINTERNAL)RTMemAllocZ(sizeof(RTFILEAIOCTXINTERNAL));
@@ -334 +334 @@
 RTDECL(uint32_t) RTFileAioCtxGetMaxReqCount(RTFILEAIOCTX hAioCtx)
 {
+    RT_NOREF_PV(hAioCtx);
     return RTFILEAIO_UNLIMITED_REQS;
 }

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -1839 +1839 @@
         error = x.what();
     }
+
+private:
+    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(IOContext) /* (shuts up C4626 and C4625 MSC warnings) */
 };
 
@@ -1847 +1850 @@
     {
     }
+
+private:
+    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(ReadContext) /* (shuts up C4626 and C4625 MSC warnings) */
 };
 
@@ -1855 +1861 @@
     {
     }
+
+private:
+    DECLARE_CLS_COPY_CTOR_ASSIGN_NOOP(WriteContext) /* (shuts up C4626 and C4625 MSC warnings) */
 };