Changeset 107672 in vbox for trunk/src/VBox/Storage/VMDK.cpp

Timestamp:

Jan 10, 2025 3:41:35 PM (6 weeks ago)

Author:

vboxsync

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

166764

Message:

Storage/VMDK.cpp: Fix unused variable parfait warnings + small cleanup, bugref:3409

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -3198 +3198 @@
     else
     {
-        uint64_t cSectorsPerGDE, cSectorsPerGD;
         pExtent->enmType = VMDKETYPE_HOSTED_SPARSE;
         pExtent->cSectors = VMDK_BYTE2SECTOR(RT_ALIGN_64(cbSize, _64K));
         pExtent->cSectorsPerGrain = VMDK_BYTE2SECTOR(_64K);
         pExtent->cGTEntries = 512;
-        cSectorsPerGDE = pExtent->cGTEntries * pExtent->cSectorsPerGrain;
+
+        uint64_t const cSectorsPerGDE = pExtent->cGTEntries * pExtent->cSectorsPerGrain;
         pExtent->cSectorsPerGDE = cSectorsPerGDE;
         pExtent->cGDEntries = (pExtent->cSectors + cSectorsPerGDE - 1) / cSectorsPerGDE;
-        cSectorsPerGD = (pExtent->cGDEntries + (512 / sizeof(uint32_t) - 1)) / (512 / sizeof(uint32_t));
     }
 
@@ -5592 +5591 @@
         if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
-            uint64_t cSectorsPerGDE, cSectorsPerGD;
             pExtent->enmType = VMDKETYPE_HOSTED_SPARSE;
             pExtent->cSectors = VMDK_BYTE2SECTOR(RT_ALIGN_64(cbExtent, _64K));
             pExtent->cSectorsPerGrain = VMDK_BYTE2SECTOR(_64K);
             pExtent->cGTEntries = 512;
-            cSectorsPerGDE = pExtent->cGTEntries * pExtent->cSectorsPerGrain;
+
+            uint64_t const cSectorsPerGDE = pExtent->cGTEntries * pExtent->cSectorsPerGrain;
             pExtent->cSectorsPerGDE = cSectorsPerGDE;
             pExtent->cGDEntries = (pExtent->cSectors + cSectorsPerGDE - 1) / cSectorsPerGDE;
-            cSectorsPerGD = (pExtent->cGDEntries + (512 / sizeof(uint32_t) - 1)) / (512 / sizeof(uint32_t));
             if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
             {
@@ -5732 +5730 @@
     pImage->pDescData = NULL;
 
-    uint64_t cSectorsPerGDE, cSectorsPerGD;
     pExtent->enmType = VMDKETYPE_HOSTED_SPARSE;
     pExtent->cSectors = VMDK_BYTE2SECTOR(RT_ALIGN_64(cbSize, _64K));
     pExtent->cSectorsPerGrain = VMDK_BYTE2SECTOR(_64K);
     pExtent->cGTEntries = 512;
-    cSectorsPerGDE = pExtent->cGTEntries * pExtent->cSectorsPerGrain;
+
+    uint64_t const cSectorsPerGDE = pExtent->cGTEntries * pExtent->cSectorsPerGrain;
     pExtent->cSectorsPerGDE = cSectorsPerGDE;
     pExtent->cGDEntries = (pExtent->cSectors + cSectorsPerGDE - 1) / cSectorsPerGDE;
-    cSectorsPerGD = (pExtent->cGDEntries + (512 / sizeof(uint32_t) - 1)) / (512 / sizeof(uint32_t));
 
     /* The spec says version is 1 for all VMDKs, but the vast