Changeset 40107 in vbox for trunk/src/VBox/Storage

Timestamp:

Feb 13, 2012 7:36:26 PM (13 years ago)

Author:

vboxsync

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

76248

Message:

Storage: The backend has to provide the nweline when calling vdIfErrorMessage

File:

• trunk/src/VBox/Storage/VHD.cpp (modified) (12 diffs)

trunk/src/VBox/Storage/VHD.cpp

@@ -3129 +3129 @@
             }
             else
-                vdIfErrorMessage(pIfError, "Missing footer structure, using backup");
+                vdIfErrorMessage(pIfError, "Missing footer structure, using backup\n");
 
             /* Remember to fix the footer structure. */
@@ -3146 +3146 @@
         if (u32ChkSumOld != u32ChkSum)
         {
-            vdIfErrorMessage(pIfError, "Checksum is invalid (should be %u got %u), repairing",
+            vdIfErrorMessage(pIfError, "Checksum is invalid (should be %u got %u), repairing\n",
                              u32ChkSum, u32ChkSumOld);
             fRepairFooter = true;
@@ -3204 +3204 @@
             if (u32ChkSumOld != u32ChkSum)
             {
-                vdIfErrorMessage(pIfError, "Checksum of dynamic disk header is invalid (should be %u got %u), repairing",
+                vdIfErrorMessage(pIfError, "Checksum of dynamic disk header is invalid (should be %u got %u), repairing\n",
                                  u32ChkSum, u32ChkSumOld);
                 fRepairDynHeader = true;
@@ -3258 +3258 @@
             }
 
-            vdIfErrorMessage(pIfError, "First data block at sector %u", idxMinBlock);
+            vdIfErrorMessage(pIfError, "First data block at sector %u\n", idxMinBlock);
 
             for (uint32_t i = 0; i < cBatEntries; i++)
@@ -3272 +3272 @@
                     if (offBlock + cbBlock > cbFile)
                     {
-                        vdIfErrorMessage(pIfError, "Entry %u points to invalid offset %llu, clearing",
+                        vdIfErrorMessage(pIfError, "Entry %u points to invalid offset %llu, clearing\n",
                                          i, offBlock);
                         paBat[i] = 0;
@@ -3279 +3279 @@
                     else if (offBlock + cbBlock > offFooter)
                     {
-                        vdIfErrorMessage(pIfError, "Entry %u intersects with footer, aligning footer",
+                        vdIfErrorMessage(pIfError, "Entry %u intersects with footer, aligning footer\n",
                                          i);
                         offFooter = offBlock + cbBlock;
@@ -3287 +3287 @@
                     if (ASMBitTestAndSet(pu32BlockBitmap, (paBat[i] - idxMinBlock) / (cbBlock / VHD_SECTOR_SIZE)))
                     {
-                        vdIfErrorMessage(pIfError, "Entry %u points to an already referenced data block, clearing",
+                        vdIfErrorMessage(pIfError, "Entry %u points to an already referenced data block, clearing\n",
                                          i);
                         paBat[i] = 0;
@@ -3298 +3298 @@
         /* Write repaired structures now. */
         if (!(fRepairBat || fRepairDynHeader || fRepairFooter))
-            vdIfErrorMessage(pIfError, "VHD image is in a consistent state, no repair required");
+            vdIfErrorMessage(pIfError, "VHD image is in a consistent state, no repair required\n");
         else if (!(fFlags & VD_REPAIR_DRY_RUN))
         {
@@ -3306 +3306 @@
                     paBat[i] = RT_H2BE_U32(paBat[i]);
 
-                vdIfErrorMessage(pIfError, "Writing repaired block allocation table...");
+                vdIfErrorMessage(pIfError, "Writing repaired block allocation table...\n");
 
                 rc = vdIfIoIntFileWriteSync(pIfIo, pStorage, offBat, paBat,
@@ -3323 +3323 @@
                 Assert(fDynamic);
 
-                vdIfErrorMessage(pIfError, "Writing repaired dynamic disk header...");
+                vdIfErrorMessage(pIfError, "Writing repaired dynamic disk header...\n");
                 rc = vdIfIoIntFileWriteSync(pIfIo, pStorage, offDynamicDiskHeader, &dynamicDiskHeader,
                                             sizeof(VHDDynamicDiskHeader), NULL);
@@ -3337 +3337 @@
             if (fRepairFooter)
             {
-                vdIfErrorMessage(pIfError, "Writing repaired Footer...");
+                vdIfErrorMessage(pIfError, "Writing repaired Footer...\n");
 
                 if (fDynamic)
@@ -3364 +3364 @@
             }
 
-            vdIfErrorMessage(pIfError, "Corrupted VHD image repaired successfully");
+            vdIfErrorMessage(pIfError, "Corrupted VHD image repaired successfully\n");
         }
     } while(0);