Changeset 90817 in vbox for trunk/src

Timestamp:

Aug 23, 2021 8:26:08 PM (3 years ago)

Author:

vboxsync

Message:

Storage: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -8431 +8431 @@
 VBOXDDU_DECL(bool) VDIsReadOnly(PVDISK pDisk)
 {
-    bool fReadOnly;
-    int rc2;
-    bool fLockRead = false;
-
     LogFlowFunc(("pDisk=%#p\n", pDisk));
-    do
-    {
-        /* sanity check */
-        AssertPtrBreakStmt(pDisk, fReadOnly = false);
-        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
-
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-        fLockRead = true;
-
-        PVDIMAGE pImage = pDisk->pLast;
-        AssertPtrBreakStmt(pImage, fReadOnly = true);
-
-        unsigned uOpenFlags;
-        uOpenFlags = pDisk->pLast->Backend->pfnGetOpenFlags(pDisk->pLast->pBackendData);
+    /* sanity check */
+    AssertPtrReturn(pDisk, true);
+    AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
+
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    bool fReadOnly = true;
+    PVDIMAGE pImage = pDisk->pLast;
+    AssertPtr(pImage);
+    if (pImage)
+    {
+        unsigned uOpenFlags = pDisk->pLast->Backend->pfnGetOpenFlags(pDisk->pLast->pBackendData);
         fReadOnly = !!(uOpenFlags & VD_OPEN_FLAGS_READONLY);
-    } while (0);
-
-    if (RT_UNLIKELY(fLockRead))
-    {
-        rc2 = vdThreadFinishRead(pDisk);
-        AssertRC(rc2);
-    }
+    }
+
+    rc2 = vdThreadFinishRead(pDisk);
+    AssertRC(rc2);
 
     LogFlowFunc(("returns %d\n", fReadOnly));
@@ -8467 +8458 @@
 VBOXDDU_DECL(uint32_t) VDGetSectorSize(PVDISK pDisk, unsigned nImage)
 {
-    uint64_t cbSector;
-    int rc2;
-    bool fLockRead = false;
-
     LogFlowFunc(("pDisk=%#p nImage=%u\n", pDisk, nImage));
-    do
-    {
-        /* sanity check */
-        AssertPtrBreakStmt(pDisk, cbSector = 0);
-        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
-
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-        fLockRead = true;
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, cbSector = 0);
-
+    /* sanity check */
+    AssertPtrReturn(pDisk, 0);
+    AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
+
+    /* Do the job. */
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    uint64_t cbSector = 0;
+    PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
+    AssertPtr(pImage);
+    if (pImage)
+    {
         PCVDREGIONLIST pRegionList = NULL;
         int rc = pImage->Backend->pfnQueryRegions(pImage->pBackendData, &pRegionList);
         if (RT_SUCCESS(rc))
         {
-            AssertBreakStmt(pRegionList->cRegions == 1, cbSector = 0);
-            cbSector = pRegionList->aRegions[0].cbBlock;
-
-            AssertPtr(pImage->Backend->pfnRegionListRelease);
-            pImage->Backend->pfnRegionListRelease(pImage->pBackendData, pRegionList);
-        }
-        else
-            cbSector = 0;
-    } while (0);
-
-    if (RT_UNLIKELY(fLockRead))
-    {
-        rc2 = vdThreadFinishRead(pDisk);
-        AssertRC(rc2);
-    }
+            AssertMsg(pRegionList->cRegions == 1, ("%u\n", pRegionList->cRegions));
+            if (pRegionList->cRegions == 1)
+            {
+                cbSector = pRegionList->aRegions[0].cbBlock;
+
+                AssertPtr(pImage->Backend->pfnRegionListRelease);
+                pImage->Backend->pfnRegionListRelease(pImage->pBackendData, pRegionList);
+            }
+        }
+    }
+
+    rc2 = vdThreadFinishRead(pDisk);
+    AssertRC(rc2);
 
     LogFlowFunc(("returns %u\n", cbSector));
@@ -8514 +8499 @@
     LogFlowFunc(("pDisk=%#p nImage=%u\n", pDisk, nImage));
     /* sanity check */
-    AssertPtrReturn(pDisk, VERR_INVALID_POINTER);
+    AssertPtrReturn(pDisk, 0);
     AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));