Changeset 90819 in vbox for trunk/src/VBox

Timestamp:

Aug 23, 2021 8:34:30 PM (3 years ago)

Author:

vboxsync

Message:

Storage: More VALID_PTR -> RT_VALID_PTR/AssertPtr.

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -8540 +8540 @@
                                     PVDGEOMETRY pPCHSGeometry)
 {
-    int rc = VINF_SUCCESS;
-    int rc2;
-
     LogFlowFunc(("pDisk=%#p nImage=%u pPCHSGeometry=%#p\n",
                  pDisk, nImage, pPCHSGeometry));
@@ -8552 +8549 @@
     AssertPtrReturn(pPCHSGeometry, VERR_INVALID_POINTER);
 
-    do
-    {
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
-
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    int rc;
+    PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
+    AssertPtr(pImage);
+    if (pImage)
+    {
         if (pImage == pDisk->pLast)
         {
             /* Use cached information if possible. */
             if (pDisk->PCHSGeometry.cCylinders != 0)
+            {
                 *pPCHSGeometry = pDisk->PCHSGeometry;
+                rc = VINF_SUCCESS;
+            }
             else
                 rc = VERR_VD_GEOMETRY_NOT_SET;
         }
         else
-            rc = pImage->Backend->pfnGetPCHSGeometry(pImage->pBackendData,
-                                                     pPCHSGeometry);
-    } while (0);
+            rc = pImage->Backend->pfnGetPCHSGeometry(pImage->pBackendData, pPCHSGeometry);
+    }
+    else
+        rc = VERR_VD_IMAGE_NOT_FOUND;
 
     rc2 = vdThreadFinishRead(pDisk);
@@ -8588 +8589 @@
     int rc = VINF_SUCCESS;
     int rc2;
-    bool fLockWrite = false;
 
     LogFlowFunc(("pDisk=%#p nImage=%u pPCHSGeometry=%#p PCHS=%u/%u/%u\n",
@@ -8607 +8607 @@
         rc2 = vdThreadStartWrite(pDisk);
         AssertRC(rc2);
-        fLockWrite = true;
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -8664 +8663 @@
     } while (0);
 
-    if (RT_UNLIKELY(fLockWrite))
-    {
-        rc2 = vdThreadFinishWrite(pDisk);
-        AssertRC(rc2);
-    }
+    rc2 = vdThreadFinishWrite(pDisk);
+    AssertRC(rc2);
 
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -8678 +8674 @@
                                     PVDGEOMETRY pLCHSGeometry)
 {
-    int rc = VINF_SUCCESS;
-    int rc2;
-
     LogFlowFunc(("pDisk=%#p nImage=%u pLCHSGeometry=%#p\n",
                  pDisk, nImage, pLCHSGeometry));
@@ -8690 +8683 @@
     AssertPtrReturn(pLCHSGeometry, VERR_INVALID_POINTER);
 
-    do
-    {
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
-
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    int rc = VINF_SUCCESS;
+    PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
+    AssertPtr(pImage);
+    if (pImage)
+    {
         if (pImage == pDisk->pLast)
         {
@@ -8707 +8700 @@
         }
         else
-            rc = pImage->Backend->pfnGetLCHSGeometry(pImage->pBackendData,
-                                                     pLCHSGeometry);
-    } while (0);
+            rc = pImage->Backend->pfnGetLCHSGeometry(pImage->pBackendData, pLCHSGeometry);
+    }
+    else
+        rc = VERR_VD_IMAGE_NOT_FOUND;
 
     rc2 = vdThreadFinishRead(pDisk);
@@ -8726 +8720 @@
     int rc = VINF_SUCCESS;
     int rc2;
-    bool fLockWrite = false;
 
     LogFlowFunc(("pDisk=%#p nImage=%u pLCHSGeometry=%#p LCHS=%u/%u/%u\n",
@@ -8746 +8739 @@
         rc2 = vdThreadStartWrite(pDisk);
         AssertRC(rc2);
-        fLockWrite = true;
 
         PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
@@ -8803 +8795 @@
     } while (0);
 
-    if (RT_UNLIKELY(fLockWrite))
-    {
-        rc2 = vdThreadFinishWrite(pDisk);
-        AssertRC(rc2);
-    }
+    rc2 = vdThreadFinishWrite(pDisk);
+    AssertRC(rc2);
 
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -8817 +8806 @@
                                  PPVDREGIONLIST ppRegionList)
 {
-    int rc = VINF_SUCCESS;
-    int rc2;
-
     LogFlowFunc(("pDisk=%#p nImage=%u fFlags=%#x ppRegionList=%#p\n",
                  pDisk, nImage, fFlags, ppRegionList));
@@ -8829 +8815 @@
     AssertPtrReturn(ppRegionList, VERR_INVALID_POINTER);
 
-    do
-    {
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
-
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    int rc;
+    PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
+    AssertPtr(pImage);
+    if (pImage)
+    {
         PCVDREGIONLIST pRegionList = NULL;
         rc = pImage->Backend->pfnQueryRegions(pImage->pBackendData, &pRegionList);
@@ -8846 +8832 @@
             pImage->Backend->pfnRegionListRelease(pImage->pBackendData, pRegionList);
         }
-    } while (0);
+    }
+    else
+        rc = VERR_VD_IMAGE_NOT_FOUND;
 
     rc2 = vdThreadFinishRead(pDisk);
@@ -8865 +8853 @@
                                unsigned *puVersion)
 {
-    int rc = VINF_SUCCESS;
-    int rc2;
-
     LogFlowFunc(("pDisk=%#p nImage=%u puVersion=%#p\n",
                  pDisk, nImage, puVersion));
@@ -8877 +8862 @@
     AssertPtrReturn(puVersion, VERR_INVALID_POINTER);
 
-    do
-    {
-        rc2 = vdThreadStartRead(pDisk);
-        AssertRC(rc2);
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
-
+    int rc2 = vdThreadStartRead(pDisk);
+    AssertRC(rc2);
+
+    int rc = VINF_SUCCESS;
+    PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
+    AssertPtr(pImage);
+    if (pImage)
         *puVersion = pImage->Backend->pfnGetVersion(pImage->pBackendData);
-    } while (0);
+    else
+        rc = VERR_VD_IMAGE_NOT_FOUND;
 
     rc2 = vdThreadFinishRead(pDisk);