Changeset 63789 in vbox

Timestamp:

Sep 9, 2016 10:29:53 PM (8 years ago)

Author:

vboxsync

Message:

Storage/QED: Revert accidental change in r110609

File:

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

trunk/src/VBox/Storage/QED.cpp

@@ -1151 +1151 @@
 static int qedOpenImage(PQEDIMAGE pImage, unsigned uOpenFlags)
 {
+    int rc;
+
     pImage->uOpenFlags = uOpenFlags;
+
     pImage->pIfError = VDIfErrorGet(pImage->pVDIfsDisk);
     pImage->pIfIo = VDIfIoIntGet(pImage->pVDIfsImage);
@@ -1160 +1163 @@
      * even if opening the image file fails.
      */
-    int rc = qedL2TblCacheCreate(pImage);
+    rc = qedL2TblCacheCreate(pImage);
     if (RT_FAILURE(rc))
     {
@@ -1185 +1188 @@
 
     uint64_t cbFile;
+    QedHeader Header;
     rc = vdIfIoIntFileGetSize(pImage->pIfIo, pImage->pStorage, &cbFile);
     if (RT_FAILURE(rc))
         goto out;
-    if (cbFile > sizeof(QedHeader))
-    {
-        QedHeader Header;
-
+    if (cbFile > sizeof(Header))
+    {
         rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, 0, &Header, sizeof(Header));
         if (   RT_SUCCESS(rc)