Changeset 57007 in vbox for trunk/src/VBox

Timestamp:

Jul 19, 2015 1:39:42 AM (9 years ago)

Author:

vboxsync

Message:

Storage: Error formatting fixes.

Location:

trunk/src/VBox/Storage

Files:

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

trunk/src/VBox/Storage/VDI.cpp

@@ -557 +557 @@
         {
             rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
-                           N_("VDI: Getting data alignment for '%s' failed (%Rrc)"), pImage->pszFilename);
+                           N_("VDI: Getting data alignment for '%s' failed (%Rrc)"), pImage->pszFilename, rc);
             goto out;
         }

trunk/src/VBox/Storage/VHDX.cpp

@@ -1228 +1228 @@
             rc = vdIfError(pImage->pIfError, VERR_NO_MEMORY, RT_SRC_POS,
                            "VHDX: Out of memory allocating memory for %u BAT entries of image \'%s\'",
-                           cBatEntries);
+                           cBatEntries, pImage->pszFilename);
     }
     else

trunk/src/VBox/Storage/VMDK.cpp

@@ -1074 +1074 @@
     if (RT_FAILURE(rc))
     {
-        rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not read grain directory in '%s': %Rrc"), pExtent->pszFullname);
+        rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
+                       N_("VMDK: could not read grain directory in '%s': %Rrc"), pExtent->pszFullname, rc);
         goto out;
     }
@@ -1091 +1092 @@
         if (RT_FAILURE(rc))
         {
-            rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not read redundant grain directory in '%s'"), pExtent->pszFullname);
+            rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
+                           N_("VMDK: could not read redundant grain directory in '%s'"), pExtent->pszFullname);
             goto out;
         }