Changeset 68787 in vbox

Timestamp:

Sep 19, 2017 8:53:40 AM (7 years ago)

Author:

vboxsync

Message:

Storage/VDI+VHD+VMDK: Preserve the error code (instead of ignoring) when deleting the image failed. It's confusing to report success but still have the file in place.

Location:

trunk/src/VBox/Storage

Files:

• VDI.cpp (modified) (1 diff)
• VHD.cpp (modified) (1 diff)
• VMDK.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/VDI.cpp

@@ -244 +244 @@
 
         if (fDelete && pImage->pszFilename)
-            vdIfIoIntFileDelete(pImage->pIfIo, pImage->pszFilename);
+        {
+            int rc2 = vdIfIoIntFileDelete(pImage->pIfIo, pImage->pszFilename);
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+        }
     }
 

trunk/src/VBox/Storage/VHD.cpp

@@ -588 +588 @@
 
         if (fDelete && pImage->pszFilename)
-            vdIfIoIntFileDelete(pImage->pIfIo, pImage->pszFilename);
+        {
+            int rc2 = vdIfIoIntFileDelete(pImage->pIfIo, pImage->pszFilename);
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+        }
     }
 

trunk/src/VBox/Storage/VMDK.cpp

@@ -637 +637 @@
 
         rc = vdIfIoIntFileClose(pImage->pIfIo, pVmdkFile->pStorage);
-        if (RT_SUCCESS(rc) && pVmdkFile->fDelete)
-            rc = vdIfIoIntFileDelete(pImage->pIfIo, pVmdkFile->pszFilename);
+        if (pVmdkFile->fDelete)
+        {
+            int rc2 = vdIfIoIntFileDelete(pImage->pIfIo, pVmdkFile->pszFilename);
+            if (RT_SUCCESS(rc))
+                rc = rc2;
+        }
         RTStrFree((char *)(void *)pVmdkFile->pszFilename);
         RTMemFree(pVmdkFile);
@@ -3261 +3265 @@
     else
     {
-        vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: error reading the magic number in '%s'"), pImage->pszFilename);   
+        vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: error reading the magic number in '%s'"), pImage->pszFilename);
         rc = VERR_VD_VMDK_INVALID_HEADER;
     }