Changeset 107467 in vbox

Timestamp:

Jan 7, 2025 2:31:55 PM (3 weeks ago)

Author:

vboxsync

Message:

Storage/VD.cpp: Fix some harmless parfait warnings, bugref:3409

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (16 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -3595 +3595 @@
         }
     }
-    else if (fFlush)
+    else
         RTMemFree(pMetaXfer);
 
@@ -5540 +5540 @@
             rc = VDInterfaceAdd(&pImage->VDIo.VDIfIo.Core, "VD_IO", VDINTERFACETYPE_IO,
                                 pDisk, sizeof(VDINTERFACEIO), &pVDIfsImage);
+            AssertRCBreak(rc);
             pImage->VDIo.pInterfaceIo = &pImage->VDIo.VDIfIo;
         }
@@ -5548 +5549 @@
         rc = VDInterfaceAdd(&pImage->VDIo.VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
                             &pImage->VDIo, sizeof(VDINTERFACEIOINT), &pImage->pVDIfsImage);
-        AssertRC(rc);
+        AssertRCBreak(rc);
 
         pImage->uOpenFlags = uOpenFlags & (VD_OPEN_FLAGS_HONOR_SAME | VD_OPEN_FLAGS_DISCARD | VD_OPEN_FLAGS_IGNORE_FLUSH | VD_OPEN_FLAGS_INFORM_ABOUT_ZERO_BLOCKS);
@@ -5812 +5813 @@
             rc = VDInterfaceAdd(&pCache->VDIo.VDIfIo.Core, "VD_IO", VDINTERFACETYPE_IO,
                                 pDisk, sizeof(VDINTERFACEIO), &pVDIfsCache);
+            AssertRCBreak(rc);
             pCache->VDIo.pInterfaceIo = &pCache->VDIo.VDIfIo;
         }
@@ -5820 +5822 @@
         rc = VDInterfaceAdd(&pCache->VDIo.VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
                             &pCache->VDIo, sizeof(VDINTERFACEIOINT), &pCache->pVDIfsCache);
-        AssertRC(rc);
+        AssertRCBreak(rc);
 
         pCache->uOpenFlags = uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME;
@@ -5971 +5973 @@
         rc = VDInterfaceAdd(&pFilter->VDIo.VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
                             &pFilter->VDIo, sizeof(VDINTERFACEIOINT), &pFilter->pVDIfsFilter);
-        AssertRC(rc);
+        AssertRCBreak(rc);
 
         rc = pFilter->pBackend->pfnCreate(pDisk->pVDIfsDisk, fFlags & VD_FILTER_FLAGS_INFO,
@@ -6121 +6123 @@
             rc = VDInterfaceAdd(&pImage->VDIo.VDIfIo.Core, "VD_IO", VDINTERFACETYPE_IO,
                                 pDisk, sizeof(VDINTERFACEIO), &pVDIfsImage);
+            AssertRCBreak(rc);
             pImage->VDIo.pInterfaceIo = &pImage->VDIo.VDIfIo;
         }
@@ -6129 +6132 @@
         rc = VDInterfaceAdd(&pImage->VDIo.VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
                             &pImage->VDIo, sizeof(VDINTERFACEIOINT), &pImage->pVDIfsImage);
-        AssertRC(rc);
+        AssertRCBreak(rc);
 
         rc = vdFindImageBackend(pszBackend, &pImage->Backend);
@@ -6402 +6405 @@
             rc = VDInterfaceAdd(&pImage->VDIo.VDIfIo.Core, "VD_IO", VDINTERFACETYPE_IO,
                                 pDisk, sizeof(VDINTERFACEIO), &pVDIfsImage);
+            AssertRCBreak(rc);
             pImage->VDIo.pInterfaceIo = &pImage->VDIo.VDIfIo;
         }
@@ -6410 +6414 @@
         rc = VDInterfaceAdd(&pImage->VDIo.VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
                             &pImage->VDIo, sizeof(VDINTERFACEIOINT), &pImage->pVDIfsImage);
-        AssertRC(rc);
+        AssertRCBreak(rc);
 
         /* Create UUID if the caller didn't specify one. */
@@ -6630 +6634 @@
             rc = VDInterfaceAdd(&pCache->VDIo.VDIfIo.Core, "VD_IO", VDINTERFACETYPE_IO,
                                 pDisk, sizeof(VDINTERFACEIO), &pVDIfsCache);
+            AssertRCBreak(rc);
             pCache->VDIo.pInterfaceIo = &pCache->VDIo.VDIfIo;
         }
@@ -6638 +6643 @@
         rc = VDInterfaceAdd(&pCache->VDIo.VDIfIoInt.Core, "VD_IOINT", VDINTERFACETYPE_IOINT,
                             &pCache->VDIo, sizeof(VDINTERFACEIOINT), &pCache->pVDIfsCache);
-        AssertRC(rc);
+        AssertRCBreak(rc);
 
         /* Create UUID if the caller didn't specify one. */
@@ -7229 +7234 @@
             /* Rename only works when backends are the same, are file based
              * and the rename method is implemented. */
-            if (    fMoveByRename
-                &&  !RTStrICmp(pszBackend, pImageFrom->Backend->pszBackendName)
+            if (    !RTStrICmp(pszBackend, pImageFrom->Backend->pszBackendName)
                 &&  pImageFrom->Backend->uBackendCaps & VD_CAP_FILE
                 &&  pImageFrom->Backend->pfnRename)
@@ -7551 +7555 @@
             rc = VDInterfaceAdd(&VDIfParent.Core, "VDCompact_ParentState", VDINTERFACETYPE_PARENTSTATE,
                                 &ParentUser, sizeof(VDINTERFACEPARENTSTATE), &pVDIfsOperation);
-            AssertRC(rc);
+            AssertRCBreak(rc);
         }
 
@@ -7777 +7781 @@
         if (RT_SUCCESS(rc))
         {
-            unsigned cImgCur = 0;
             unsigned uPercentStart = 0;
             unsigned uPercentSpan = 100 / pDisk->cImages - 1;
@@ -7858 +7861 @@
 
                 pImage = pImage->pNext;
-                cImgCur++;
                 uPercentStart += uPercentSpan;
             }
 
             pDisk->fLocked = false;
-            if (pvBuf)
-                RTMemTmpFree(pvBuf);
+            RTMemTmpFree(pvBuf);
         }