Changeset 90812 in vbox

Timestamp:

Aug 23, 2021 8:08:03 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

@@ -9339 +9339 @@
                                   PRTUUID pUuid)
 {
-    int rc = VINF_SUCCESS;
-    int rc2;
-    bool fLockRead = false;
-
     LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p\n", pDisk, nImage, pUuid));
-    do
-    {
-        /* sanity check */
-        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
-        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
-
-        /* Check arguments. */
-        AssertMsgBreakStmt(VALID_PTR(pUuid),
-                           ("pUuid=%#p\n", pUuid),
-                           rc = VERR_INVALID_PARAMETER);
-
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-        fLockRead = true;
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
-
+    /* sanity check */
+    AssertPtrReturn(pDisk, VERR_INVALID_POINTER);
+    AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
+
+    /* Check arguments. */
+    AssertPtrReturn(pUuid, VERR_INVALID_POINTER);
+
+    /* Do the job. */
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    int rc;
+    PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
+    AssertPtr(pImage);
+    if (pImage)
         rc = pImage->Backend->pfnGetParentUuid(pImage->pBackendData, pUuid);
-    } while (0);
-
-    if (RT_UNLIKELY(fLockRead))
-    {
-        rc2 = vdThreadFinishRead(pDisk);
-        AssertRC(rc2);
-    }
+    else
+        rc = VERR_VD_IMAGE_NOT_FOUND;
+
+    rc2 = vdThreadFinishRead(pDisk);
+    AssertRC(rc2);
 
     LogFlowFunc(("returns %Rrc, Uuid={%RTuuid}\n", rc, pUuid));
@@ -9379 +9370 @@
                                   PCRTUUID pUuid)
 {
-    int rc;
-    int rc2;
-    bool fLockWrite = false;
-
     LogFlowFunc(("pDisk=%#p nImage=%u pUuid=%#p {%RTuuid}\n",
                  pDisk, nImage, pUuid, pUuid));
-    do
-    {
-        /* sanity check */
-        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
-        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
-
-        /* Check arguments. */
-        AssertMsgBreakStmt(VALID_PTR(pUuid) || pUuid == NULL,
-                           ("pUuid=%#p\n", pUuid),
-                           rc = VERR_INVALID_PARAMETER);
-
-        rc2 = vdThreadStartWrite(pDisk);
-        AssertRC(rc2);
-        fLockWrite = true;
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
-
-        RTUUID Uuid;
-        if (!pUuid)
-        {
-            RTUuidCreate(&Uuid);
-            pUuid = &Uuid;
-        }
+    /* sanity check */
+    AssertPtrReturn(pDisk, VERR_INVALID_POINTER);
+    AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
+
+    /* Check arguments. */
+    RTUUID Uuid;
+    if (pUuid)
+        AssertPtrReturn(pUuid, VERR_INVALID_POINTER);
+    else
+    {
+        int rc = RTUuidCreate(&Uuid);
+        AssertRCReturn(rc, rc);
+        pUuid = &Uuid;
+    }
+
+    /* Do the job. */
+    int rc2 = vdThreadStartWrite(pDisk);
+    AssertRC(rc2);
+
+    int rc;
+    PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
+    AssertPtr(pImage);
+    if (pImage)
         rc = pImage->Backend->pfnSetParentUuid(pImage->pBackendData, pUuid);
-    } while (0);
-
-    if (RT_UNLIKELY(fLockWrite))
-    {
-        rc2 = vdThreadFinishWrite(pDisk);
-        AssertRC(rc2);
-    }
+    else
+        rc = VERR_VD_IMAGE_NOT_FOUND;
+
+    rc2 = vdThreadFinishWrite(pDisk);
+    AssertRC(rc2);
 
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -9425 +9409 @@
 VBOXDDU_DECL(void) VDDumpImages(PVDISK pDisk)
 {
-    int rc2;
-    bool fLockRead = false;
-
-    do
-    {
-        /* sanity check */
-        AssertPtrBreak(pDisk);
-        AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
-
-        if (!pDisk->pInterfaceError || !VALID_PTR(pDisk->pInterfaceError->pfnMessage))
-            pDisk->pInterfaceError->pfnMessage = vdLogMessage;
-
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-        fLockRead = true;
-
-        vdMessageWrapper(pDisk, "--- Dumping VD Disk, Images=%u\n", pDisk->cImages);
-        for (PVDIMAGE pImage = pDisk->pBase; pImage; pImage = pImage->pNext)
-        {
-            vdMessageWrapper(pDisk, "Dumping VD image \"%s\" (Backend=%s)\n",
-                             pImage->pszFilename, pImage->Backend->pszBackendName);
-            pImage->Backend->pfnDump(pImage->pBackendData);
-        }
-    } while (0);
-
-    if (RT_UNLIKELY(fLockRead))
-    {
-        rc2 = vdThreadFinishRead(pDisk);
-        AssertRC(rc2);
-    }
+    /* sanity check */
+    AssertPtrReturnVoid(pDisk);
+    AssertMsg(pDisk->u32Signature == VDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
+
+    if (!pDisk->pInterfaceError || !RT_VALID_PTR(pDisk->pInterfaceError->pfnMessage)) /** @todo r=bird: first test is boinkers. */
+        pDisk->pInterfaceError->pfnMessage = vdLogMessage;
+
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    vdMessageWrapper(pDisk, "--- Dumping VD Disk, Images=%u\n", pDisk->cImages);
+    for (PVDIMAGE pImage = pDisk->pBase; pImage; pImage = pImage->pNext)
+    {
+        vdMessageWrapper(pDisk, "Dumping VD image \"%s\" (Backend=%s)\n",
+                         pImage->pszFilename, pImage->Backend->pszBackendName);
+        pImage->Backend->pfnDump(pImage->pBackendData);
+    }
+
+    rc2 = vdThreadFinishRead(pDisk);
+    AssertRC(rc2);
 }