Changeset 103524 in vbox

Timestamp:

Feb 22, 2024 11:17:44 AM (11 months ago)

Author:

vboxsync

Message:

Storage/VDI.cpp: Some unused variable and macro double expansion fixes, bugref:3409

File:

• trunk/src/VBox/Storage/VDI.cpp (modified) (10 diffs)

trunk/src/VBox/Storage/VDI.cpp

@@ -1635 +1635 @@
 
     /* Clip read range to at most the rest of the block. */
-    cbToRead = RT_MIN(cbToRead, getImageBlockSize(&pImage->Header) - offRead);
+    size_t cbBlockRem = getImageBlockSize(&pImage->Header) - offRead;
+    cbToRead = RT_MIN(cbToRead, cbBlockRem);
     Assert(!(cbToRead % 512));
 
@@ -1645 +1646 @@
 
         cbSet = vdIfIoIntIoCtxSet(pImage->pIfIo, pIoCtx, 0, cbToRead);
-        Assert(cbSet == cbToRead);
+        Assert(cbSet == cbToRead); RT_NOREF(cbSet);
     }
     else
@@ -1700 +1701 @@
 
         /* Clip write range to at most the rest of the block. */
-        cbToWrite = RT_MIN(cbToWrite, getImageBlockSize(&pImage->Header) - offWrite);
+        size_t cbBlockRem = getImageBlockSize(&pImage->Header) - offWrite;
+        cbToWrite = RT_MIN(cbToWrite, cbBlockRem);
         Assert(!(cbToWrite % 512));
 
@@ -1988 +1990 @@
     PVDIIMAGEDESC pImage = (PVDIIMAGEDESC)pBackendData;
     int rc;
-    const char *pszFilename;
 
     /* Image must be opened and the new flags must be valid. */
@@ -1999 +2000 @@
     {
         /* Implement this operation via reopening the image. */
-        pszFilename = pImage->pszFilename;
         rc = vdiFreeImage(pImage, false);
         if (RT_SUCCESS(rc))
@@ -2503 +2503 @@
                 rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, u64Offset,
                                            pvTmp, cbBlock);
+                if (RT_FAILURE(rc))
+                    break;
+
                 u64Offset = (uint64_t)i * pImage->cbTotalBlockData
                           + (pImage->offStartData + pImage->offStartBlockData);
                 rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage, u64Offset,
                                             pvTmp, cbBlock);
+                if (RT_FAILURE(rc))
+                    break;
+
                 pImage->paBlocks[uBlockData] = i;
                 setImageBlocksAllocated(&pImage->Header, cBlocksAllocated - cBlocksMoved);
@@ -2581 +2587 @@
     {
         unsigned cBlocksAllocated = getImageBlocksAllocated(&pImage->Header); /** < Blocks currently allocated, doesn't change during resize */
-        unsigned const cbBlock = RT_MAX(getImageBlockSize(&pImage->Header), 1);
+        unsigned const cbBlock = getImageBlockSize(&pImage->Header);
         uint32_t cBlocksNew = cbSize / cbBlock;                               /** < New number of blocks in the image after the resize */
         if (cbSize % cbBlock)
@@ -2720 +2726 @@
                 for (unsigned idxBlock = cBlocksOld; idxBlock < cBlocksNew; idxBlock++)
                     pImage->paBlocks[idxBlock] = VDI_IMAGE_BLOCK_FREE;
+
+                /* Write the block array before updating the rest. */
+                vdiConvBlocksEndianess(VDIECONV_H2F, pImage->paBlocks, cBlocksNew);
+                rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage, pImage->offStartBlocks,
+                                            pImage->paBlocks, cbBlockspaceNew);
+                vdiConvBlocksEndianess(VDIECONV_F2H, pImage->paBlocks, cBlocksNew);
+
+                if (RT_SUCCESS(rc))
+                {
+                    /* Update size and new block count. */
+                    setImageDiskSize(&pImage->Header, cbSize);
+                    setImageBlocks(&pImage->Header, cBlocksNew);
+                    /* Update geometry. */
+                    pImage->PCHSGeometry = *pPCHSGeometry;
+                    pImage->cbImage = cbSize;
+
+                    PVDIDISKGEOMETRY pGeometry = getImageLCHSGeometry(&pImage->Header);
+                    if (pGeometry)
+                    {
+                        pGeometry->cCylinders = pLCHSGeometry->cCylinders;
+                        pGeometry->cHeads = pLCHSGeometry->cHeads;
+                        pGeometry->cSectors = pLCHSGeometry->cSectors;
+                        pGeometry->cbSector = VDI_GEOMETRY_SECTOR_SIZE;
+                    }
+                }
             }
             else
                 rc = VERR_NO_MEMORY;
-
-            /* Write the block array before updating the rest. */
-            vdiConvBlocksEndianess(VDIECONV_H2F, pImage->paBlocks, cBlocksNew);
-            rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage, pImage->offStartBlocks,
-                                        pImage->paBlocks, cbBlockspaceNew);
-            vdiConvBlocksEndianess(VDIECONV_F2H, pImage->paBlocks, cBlocksNew);
-
-            if (RT_SUCCESS(rc))
-            {
-                /* Update size and new block count. */
-                setImageDiskSize(&pImage->Header, cbSize);
-                setImageBlocks(&pImage->Header, cBlocksNew);
-                /* Update geometry. */
-                pImage->PCHSGeometry = *pPCHSGeometry;
-                pImage->cbImage = cbSize;
-
-                PVDIDISKGEOMETRY pGeometry = getImageLCHSGeometry(&pImage->Header);
-                if (pGeometry)
-                {
-                    pGeometry->cCylinders = pLCHSGeometry->cCylinders;
-                    pGeometry->cHeads = pLCHSGeometry->cHeads;
-                    pGeometry->cSectors = pLCHSGeometry->cSectors;
-                    pGeometry->cbSector = VDI_GEOMETRY_SECTOR_SIZE;
-                }
-            }
         }
 
@@ -2802 +2808 @@
 
         /* Clip range to at most the rest of the block. */
-        cbDiscard = RT_MIN(cbDiscard, getImageBlockSize(&pImage->Header) - offDiscard);
+        size_t cbBlockRem = getImageBlockSize(&pImage->Header) - offDiscard;
+        cbDiscard = RT_MIN(cbDiscard, cbBlockRem);
         Assert(!(cbDiscard % 512));
 
@@ -2813 +2820 @@
         if (IS_VDI_IMAGE_BLOCK_ALLOCATED(pImage->paBlocks[uBlock]))
         {
-            unsigned const cbBlock = RT_MAX(getImageBlockSize(&pImage->Header), 1);
+            unsigned const cbBlock = getImageBlockSize(&pImage->Header);
             size_t const cbPreAllocated = offDiscard % cbBlock;
             size_t const cbPostAllocated = getImageBlockSize(&pImage->Header) - cbDiscard - cbPreAllocated;