Changeset 2359 in vbox

Timestamp:

Apr 26, 2007 5:06:59 PM (18 years ago)

Author:

vboxsync

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

20752

Message:

Fixed variable initialization.

File:

• trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -1354 +1354 @@
     if (VBOX_FAILURE(rc))
     {
-        rc = vmdkError(pExtent->pImage, rc, RT_SRC_POS, N_("VMDK: error reading the magic number from file '%s'"), pszFilename);
+        rc = vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: error reading the magic number from file '%s'"), pszFilename);
         goto out;
     }
@@ -1929 +1929 @@
 static int vmdkOpen(const char *pszFilename, unsigned uOpenFlags, PFNVDERROR pfnError, void *pvErrorUser, void **ppvBackendData)
 {
-    int rc;
+    int rc = VINF_SUCCESS;
     PVMDKIMAGE pImage;
 
@@ -2018 +2018 @@
         case VMDKETYPE_ESX_SPARSE:
 #endif /* VBOX_WITH_VMDK_ESX */
-            /* Clip read range to at most the rest of the grain. */
-            cbRead = RT_MIN(cbRead, VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain - (uSectorOffset % pExtent->cSectorsPerGrain)));
             rc = vmdkGetSector(pImage->pGTCache, pExtent, uSectorInExtent,
                                &uSectorOffset);
             if (VBOX_FAILURE(rc))
                 goto out;
+            /* Clip read range to at most the rest of the grain. */
+            cbRead = RT_MIN(cbRead, VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain - (uSectorOffset % pExtent->cSectorsPerGrain)));
             if (uSectorOffset == 0)
                 rc = VINF_VDI_BLOCK_FREE;
@@ -2088 +2088 @@
         case VMDKETYPE_ESX_SPARSE:
 #endif /* VBOX_WITH_VMDK_ESX */
-            /* Clip write range to at most the rest of the grain. */
-            cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain - (uSectorOffset % pExtent->cSectorsPerGrain)));
             rc = vmdkGetSector(pImage->pGTCache, pExtent, uSectorInExtent,
                                &uSectorOffset);
             if (VBOX_FAILURE(rc))
                 goto out;
+            /* Clip write range to at most the rest of the grain. */
+            cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain - (uSectorOffset % pExtent->cSectorsPerGrain)));
             if (uSectorOffset == 0)
             {