Changeset 8580 in vbox for trunk

Timestamp:

May 5, 2008 1:56:33 PM (17 years ago)

Author:

vboxsync

Message:

AssertMsgBreakVoid -> AssertMsgBreak.

Location:

trunk

Files:

• include/iprt/assert.h (modified) (6 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (3 diffs)

trunk/include/iprt/assert.h

@@ -410 +410 @@
 
 
+/** @def AssertMsgBreak
+ * Assert that an expression is true and breaks if it isn't.
+ * In RT_STRICT mode it will hit a breakpoint before returning.
+ *
+ * @param   expr    Expression which should be true.
+ * @param   a       printf argument list (in parenthesis).
+ * @todo Rename to AssertMsgBreak.
+ */
+#ifdef RT_STRICT
+# define AssertMsgBreak(expr, a)  \
+    if (RT_UNLIKELY(!(expr))) \
+    { \
+        AssertMsg1(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
+        AssertMsg2 a; \
+        AssertBreakpoint(); \
+        break; \
+    } else do {} while (0)
+#else
+# define AssertMsgBreak(expr, a) \
+    if (RT_UNLIKELY(!(expr))) \
+        break; \
+    else do {} while (0)
+#endif
+
 /** @def AssertMsgBreakStmt
  * Assert that an expression is true and breaks if it isn't.
@@ -434 +458 @@
     } else do {} while (0)
 #endif
-
-/** @def AssertMsgBreakVoid
- * Assert that an expression is true and breaks if it isn't.
- * In RT_STRICT mode it will hit a breakpoint before returning.
- *
- * @param   expr    Expression which should be true.
- * @param   a       printf argument list (in parenthesis).
- * @todo Rename to AssertMsgBreak.
- */
-#ifdef RT_STRICT
-# define AssertMsgBreakVoid(expr, a)  \
-    if (RT_UNLIKELY(!(expr))) \
-    { \
-        AssertMsg1(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \
-        AssertMsg2 a; \
-        AssertBreakpoint(); \
-        break; \
-    } else do {} while (0)
-#else
-# define AssertMsgBreakVoid(expr, a) \
-    if (RT_UNLIKELY(!(expr))) \
-        break; \
-    else do {} while (0)
-#endif
-
 
 /** @def AssertFailed
@@ -1487 +1486 @@
  */
 #define AssertMsgRCBreakVoid(rc, msg) \
-    if (1) { AssertMsgBreakVoid(RT_SUCCESS(rc), msg); NOREF(rc); } else do {} while (0)
+    if (1) { AssertMsgBreak(RT_SUCCESS(rc), msg); NOREF(rc); } else do {} while (0)
 
 /** @def AssertRCSuccess
@@ -1532 +1531 @@
  * @todo Rename to AssertRCSuccessBreak.
  */
-#define AssertRCSuccessBreakVoid(rc)    AssertMsgBreakVoid((rc) == VINF_SUCCESS, ("%Vra\n", (rc)))
+#define AssertRCSuccessBreakVoid(rc)    AssertMsgBreak((rc) == VINF_SUCCESS, ("%Vra\n", (rc)))
 
 
@@ -1912 +1911 @@
  * @todo Rename to AssertPtrBreak.
  */
-#define AssertPtrBreakVoid(pv)  AssertMsgBreakVoid(VALID_PTR(pv), ("%p\n", (pv)))
+#define AssertPtrBreakVoid(pv)  AssertMsgBreak(VALID_PTR(pv), ("%p\n", (pv)))
 
 /** @def AssertPtrNull
@@ -1950 +1949 @@
  * @todo Rename to AssertPtrNullBreak.
  */
-#define AssertPtrNullBreakVoid(pv)  AssertMsgBreakVoid(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
+#define AssertPtrNullBreakVoid(pv)  AssertMsgBreak(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)))
 
 /** @def AssertGCPhys32

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp

@@ -673 +673 @@
             if (g_enmState == kClipboardState_SettingViewer)
                 break;
-            AssertMsgBreakVoid(g_enmState == kClipboardState_Viewer, ("g_enmState=%d\n", g_enmState));
+            AssertMsgBreak(g_enmState == kClipboardState_Viewer, ("g_enmState=%d\n", g_enmState));
             VBoxServiceClipboardOS2Poll();
             break;
@@ -684 +684 @@
             if (g_enmState == kClipboardState_Destroying)
                 break; /* it's us doing the replacing, ignore. */
-            AssertMsgBreakVoid(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
+            AssertMsgBreak(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
             VBoxServiceClipboardOS2Destroyed();
             break;
@@ -693 +693 @@
          */
         case WM_RENDERFMT:
-            AssertMsgBreakVoid(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
+            AssertMsgBreak(g_enmState == kClipboardState_Owner, ("g_enmState=%d\n", g_enmState));
             VBoxServiceClipboardOS2RenderFormat(SHORT1FROMMP(mp1));
             break;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -1017 +1017 @@
                 qFind (storageBusChannels.begin(), storageBusChannels.end(),
                        aChannel);
-            AssertMsgBreakVoid (it != storageBusChannels.end(),
-                                ("No value for {%s}\n", aChannel.latin1()));
+            AssertMsgBreak (it != storageBusChannels.end(),
+                            ("No value for {%s}\n", aChannel.latin1()));
             channel = (LONG) (it - storageBusChannels.begin());
             break;
@@ -1068 +1068 @@
         case KStorageBus_SATA:
         {
-            AssertMsgBreakVoid (aDevice == 0, ("Invalid device %d\n", aDevice));
+            AssertMsgBreak (aDevice == 0, ("Invalid device %d\n", aDevice));
             /* always zero so far for SATA */
             break;
@@ -1105 +1105 @@
         case KStorageBus_SATA:
         {
-            AssertMsgBreakVoid(aDevice.isEmpty(), ("Invalid device {%s}\n", aDevice.latin1()));
+            AssertMsgBreak(aDevice.isEmpty(), ("Invalid device {%s}\n", aDevice.latin1()));
             /* always zero for SATA so far. */
             break;