Changeset 63788 in vbox for trunk

Timestamp:

Sep 9, 2016 10:27:48 PM (8 years ago)

Author:

vboxsync

Message:

Storage: Remove unused/obsolete VDFormats directory (can be resurrected later if required again)

Location:

trunk/src/VBox/Storage

Files:

• Makefile.kmk (modified) (1 diff)
• QED.cpp (modified) (3 diffs)
• VDFormats (deleted)

trunk/src/VBox/Storage/Makefile.kmk

@@ -24 +24 @@
  include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
  include $(PATH_SUB_CURRENT)/Debug/Makefile.kmk
-
- ifndef VBOX_OSE
-  include $(PATH_SUB_CURRENT)/VDFormats/Makefile.kmk
- endif
 
  #

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);
@@ -1163 +1160 @@
      * even if opening the image file fails.
      */
-    rc = qedL2TblCacheCreate(pImage);
+    int rc = qedL2TblCacheCreate(pImage);
     if (RT_FAILURE(rc))
     {
@@ -1188 +1185 @@
 
     uint64_t cbFile;
-    QedHeader Header;
     rc = vdIfIoIntFileGetSize(pImage->pIfIo, pImage->pStorage, &cbFile);
     if (RT_FAILURE(rc))
         goto out;
-    if (cbFile > sizeof(Header))
-    {
+    if (cbFile > sizeof(QedHeader))
+    {
+        QedHeader Header;
+
         rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, 0, &Header, sizeof(Header));
         if (   RT_SUCCESS(rc)