Changeset 14959 in vbox for trunk/src

Timestamp:

Dec 3, 2008 9:25:17 PM (16 years ago)

Author:

vboxsync

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

40320

Message:

no trailing \n when using ComAssertMsg*

Location:

trunk/src/VBox/Main

Files:

• AudioAdapterImpl.cpp (modified) (1 diff)
• BIOSSettingsImpl.cpp (modified) (4 diffs)
• ConsoleImpl.cpp (modified) (4 diffs)
• DVDDriveImpl.cpp (modified) (1 diff)
• FloppyDriveImpl.cpp (modified) (1 diff)
• MachineImpl.cpp (modified) (4 diffs)
• NetworkAdapterImpl.cpp (modified) (1 diff)
• SerialPortImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (3 diffs)
• include/VirtualBoxBase.h (modified) (1 diff)

trunk/src/VBox/Main/AudioAdapterImpl.cpp

@@ -527 +527 @@
 #endif
             default:
-                ComAssertMsgFailedRet (("Wrong audio driver type! driver = %d\n",
+                ComAssertMsgFailedRet (("Wrong audio driver type! driver = %d",
                                         mData->mAudioDriver),
                                        E_FAIL);

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -568 +568 @@
                 mData->mBootMenuMode = BIOSBootMenuMode_MessageAndMenu;
             else
-                ComAssertMsgFailedRet (("Invalid boot menu mode '%s'\n", modeStr),
+                ComAssertMsgFailedRet (("Invalid boot menu mode '%s'", modeStr),
                                        E_FAIL);
         }
@@ -601 +601 @@
                 mData->mIDEControllerType = IDEControllerType_PIIX4;
             else
-                ComAssertMsgFailedRet (("Invalid boot menu mode '%s'\n", typeStr),
+                ComAssertMsgFailedRet (("Invalid boot menu mode '%s'", typeStr),
                                        E_FAIL);
         }
@@ -666 +666 @@
                 break;
             default:
-                ComAssertMsgFailedRet (("Invalid boot menu type: %d\n",
+                ComAssertMsgFailedRet (("Invalid boot menu type: %d",
                                         mData->mBootMenuMode),
                                        E_FAIL);
@@ -698 +698 @@
                 break;
             default:
-                ComAssertMsgFailedRet (("Invalid IDE Controller type: %d\n",
+                ComAssertMsgFailedRet (("Invalid IDE Controller type: %d",
                                         mData->mIDEControllerType),
                                        E_FAIL);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1441 +1441 @@
                               "VMPowerDown");
     ComAssertMsgRCRet (vrc,
-         ("Could not create VMPowerDown thread (%Rrc)\n", vrc), E_FAIL);
+         ("Could not create VMPowerDown thread (%Rrc)", vrc), E_FAIL);
 
     /* task is now owned by powerDownThread(), so release it */
@@ -1818 +1818 @@
                                   0, RTTHREADTYPE_MAIN_WORKER, 0, "VMSave");
 
-        ComAssertMsgRCBreak (vrc, ("Could not create VMSave thread (%Rrc)\n", vrc),
+        ComAssertMsgRCBreak (vrc, ("Could not create VMSave thread (%Rrc)", vrc),
                              rc = E_FAIL);
 
@@ -2371 +2371 @@
                                       0, RTTHREADTYPE_MAIN_WORKER, 0, "VMTakeSnap");
 
-            ComAssertMsgRCBreak (vrc, ("Could not create VMTakeSnap thread (%Rrc)\n", vrc),
+            ComAssertMsgRCBreak (vrc, ("Could not create VMTakeSnap thread (%Rrc)", vrc),
                                  rc = E_FAIL);
 
@@ -4513 +4513 @@
                               0, RTTHREADTYPE_MAIN_WORKER, 0, "VMPowerUp");
 
-    ComAssertMsgRCRet (vrc, ("Could not create VMPowerUp thread (%Rrc)\n", vrc),
+    ComAssertMsgRCRet (vrc, ("Could not create VMPowerUp thread (%Rrc)", vrc),
                        E_FAIL);
 

trunk/src/VBox/Main/DVDDriveImpl.cpp

@@ -527 +527 @@
             break;
         default:
-            ComAssertMsgFailedRet (("Invalid drive state: %d\n", mData->mState),
+            ComAssertMsgFailedRet (("Invalid drive state: %d", mData->mState),
                                     E_FAIL);
     }

trunk/src/VBox/Main/FloppyDriveImpl.cpp

@@ -534 +534 @@
             break;
         default:
-            ComAssertMsgFailedRet (("Invalid drive state: %d\n", mData->mState),
+            ComAssertMsgFailedRet (("Invalid drive state: %d", mData->mState),
                                     E_FAIL);
     }

trunk/src/VBox/Main/MachineImpl.cpp

@@ -5084 +5084 @@
                 mHWData->mBootOrder [position] = DeviceType_Network;
             else
-                ComAssertMsgFailed (("Invalid device: %s\n", device));
+                ComAssertMsgFailed (("Invalid device: %s", device));
         }
     }
@@ -6446 +6446 @@
                 default:
                 {
-                    ComAssertMsgFailedRet (("Invalid boot device: %d\n",
+                    ComAssertMsgFailedRet (("Invalid boot device: %d",
                                             mHWData->mBootOrder [pos]),
                                             E_FAIL);
@@ -7727 +7727 @@
     mIPCSem = ::CreateMutex (NULL, FALSE, mIPCSemName);
     ComAssertMsgRet (mIPCSem,
-                     ("Cannot create IPC mutex '%ls', err=%d\n",
+                     ("Cannot create IPC mutex '%ls', err=%d",
                       mIPCSemName.raw(), ::GetLastError()),
                      E_FAIL);
@@ -7736 +7736 @@
     APIRET arc = ::DosCreateMutexSem ((PSZ) ipcSem.raw(), &mIPCSem, 0, FALSE);
     ComAssertMsgRet (arc == NO_ERROR,
-                     ("Cannot create IPC mutex '%s', arc=%ld\n",
+                     ("Cannot create IPC mutex '%s', arc=%ld",
                       ipcSem.raw(), arc),
                      E_FAIL);

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -1165 +1165 @@
             break;
         default:
-            ComAssertMsgFailedRet (("Invalid network adapter type: %d\n",
+            ComAssertMsgFailedRet (("Invalid network adapter type: %d",
                                     mData->mAdapterType),
                                    E_FAIL);

trunk/src/VBox/Main/SerialPortImpl.cpp

@@ -209 +209 @@
         mData->mHostMode = PortMode_Disconnected;
     else
-        ComAssertMsgFailedRet (("Invalid port mode '%s'\n", mode), E_FAIL);
+        ComAssertMsgFailedRet (("Invalid port mode '%s'", mode), E_FAIL);
 
     /* pipe/device path (optional, defaults to null) */
@@ -260 +260 @@
             break;
         default:
-            ComAssertMsgFailedRet (("Invalid serial port mode: %d\n",
+            ComAssertMsgFailedRet (("Invalid serial port mode: %d",
                                     mData->mHostMode),
                                    E_FAIL);

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -2024 +2024 @@
                               RTTHREADFLAGS_WAITABLE, "SVCHelper");
 
-    ComAssertMsgRCRet (vrc, ("Could not create SVCHelper thread (%Rrc)\n", vrc),
+    ComAssertMsgRCRet (vrc, ("Could not create SVCHelper thread (%Rrc)", vrc),
                        E_FAIL);
 
@@ -3890 +3890 @@
     catch (const std::exception &err)
     {
-        ComAssertMsgFailedPos (("Unexpected exception '%s' (%s)\n",
+        ComAssertMsgFailedPos (("Unexpected exception '%s' (%s)",
                                 typeid (err).name(), err.what()),
                                pszFile, iLine, pszFunction);
@@ -3897 +3897 @@
     catch (...)
     {
-        ComAssertMsgFailedPos (("Unknown exception\n"),
+        ComAssertMsgFailedPos (("Unknown exception"),
                                pszFile, iLine, pszFunction);
         return E_FAIL;

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -275 +275 @@
 #define ComAssertComRC(rc)  AssertComRC (rc)
 #else
-#define ComAssertComRC(rc)  ComAssertMsg (SUCCEEDED (rc), ("COM RC = %Rhrc (0x%08X)\n", (rc), (rc)))
+#define ComAssertComRC(rc)  ComAssertMsg (SUCCEEDED (rc), ("COM RC = %Rhrc (0x%08X)", (rc), (rc)))
 #endif