儲存庫 vbox 的更動 62753

時間撮記:

2016-7-30 下午04:34:40 (8 年 以前)

作者:

vboxsync

訊息:

Storage: warnings.

檔案:

• trunk/src/VBox/Storage/VHD.cpp (修改) (14 筆差異)

trunk/src/VBox/Storage/VHD.cpp

@@ -333 +333 @@
                     memcpy(pvBuf, szPath, cb);
                 }
+                else
+                    cb = 0; /* (Shut up MSC) */
             }
             else
@@ -916 +918 @@
 DECLINLINE(bool) vhdBlockBitmapSectorSet(PVHDIMAGE pImage, uint8_t *pu8Bitmap, uint32_t cBlockBitmapEntry)
 {
+    RT_NOREF1(pImage);
     uint32_t iBitmap = (cBlockBitmapEntry / 8); /* Byte in the block bitmap. */
 
@@ -988 +991 @@
 static uint32_t vhdAllocateParentLocators(PVHDIMAGE pImage, VHDDynamicDiskHeader *pDDH, uint64_t u64Offset)
 {
+    RT_NOREF1(pImage);
     PVHDPLE pLocator = pDDH->ParentLocatorEntry;
 
@@ -1107 +1111 @@
                           unsigned uPercentStart, unsigned uPercentSpan)
 {
+    RT_NOREF3(pszComment, pPCHSGeometry, pLCHSGeometry);
     int rc;
     VHDFooter Footer;
@@ -1240 +1245 @@
                                          PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
 {
+    RT_NOREF1(pVDIfsDisk);
     LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p\n", pszFilename, pVDIfsDisk, pVDIfsImage));
     int rc;
@@ -2086 +2092 @@
                                        size_t cbComment)
 {
+    RT_NOREF2(pszComment, cbComment);
     LogFlowFunc(("pBackendData=%#p pszComment=%#p cbComment=%zu\n", pBackendData, pszComment, cbComment));
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
@@ -2104 +2111 @@
 static DECLCALLBACK(int) vhdSetComment(void *pBackendData, const char *pszComment)
 {
+    RT_NOREF1(pszComment);
     LogFlowFunc(("pBackendData=%#p pszComment=\"%s\"\n", pBackendData, pszComment));
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
@@ -2183 +2191 @@
 static DECLCALLBACK(int) vhdGetModificationUuid(void *pBackendData, PRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
@@ -2201 +2210 @@
 static DECLCALLBACK(int) vhdSetModificationUuid(void *pBackendData, PCRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
@@ -2271 +2281 @@
 static DECLCALLBACK(int) vhdGetParentModificationUuid(void *pBackendData, PRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
@@ -2289 +2300 @@
 static DECLCALLBACK(int) vhdSetParentModificationUuid(void *pBackendData, PCRTUUID pUuid)
 {
+    RT_NOREF1(pUuid);
     LogFlowFunc(("pBackendData=%#p Uuid=%RTuuid\n", pBackendData, pUuid));
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
@@ -2434 +2446 @@
                                     PVDINTERFACE pVDIfsImage, PVDINTERFACE pVDIfsOperation)
 {
+    RT_NOREF2(pVDIfsDisk, pVDIfsImage);
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
-    void *pvBuf = NULL, *pvReplace = NULL;
+    void *pvBuf = NULL;
     uint32_t *paBlocks = NULL;
 
@@ -2545 +2558 @@
                 if (ASMBitFirstSet((volatile void *)pvBuf, (uint32_t)pImage->cbDataBlock * 8) == -1)
                 {
-                    paBat[i] = ~0;
+                    paBat[i] = UINT32_MAX;
                     paBlocks[idxBlock] = ~0U;
                     /* Adjust progress info, one block to be relocated. */
@@ -2675 +2688 @@
                                    PVDINTERFACE pVDIfsOperation)
 {
+    RT_NOREF4(uPercentSpan, uPercentStart, pVDIfsDisk, pVDIfsImage);
     PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
     int rc = VINF_SUCCESS;