Changeset 8580

Timestamp:

05/05/08 15:56:33 (8 months ago)

Author:

vboxsync

Message:

AssertMsgBreakVoid? -> AssertMsgBreak?.

Files:

• trunk/include/iprt/assert.h (modified) (6 diffs)
• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (3 diffs)
• trunk/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) \
-Void
+
-
-/** @def AssertRCSuccess
@@ -1532 +1531 @@
- * @todo Rename to AssertRCSuccessBreak.
- */
-Void
+
-
-
@@ -1912 +1911 @@
- * @todo Rename to AssertPtrBreak.
- */
-Void
+
-
-/** @def AssertPtrNull
@@ -1950 +1949 @@
- * @todo Rename to AssertPtrNullBreak.
- */
-Void
+
-
-/** @def AssertGCPhys32

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

@@ -673 +673 @@
-            if (g_enmState == kClipboardState_SettingViewer)
-                break;
-Void
+
-            VBoxServiceClipboardOS2Poll();
-            break;
@@ -684 +684 @@
-            if (g_enmState == kClipboardState_Destroying)
-                break; /* it's us doing the replacing, ignore. */
-Void
+
-            VBoxServiceClipboardOS2Destroyed();
-            break;
@@ -693 +693 @@
-         */
-        case WM_RENDERFMT:
-Void
+
-            VBoxServiceClipboardOS2RenderFormat(SHORT1FROMMP(mp1));
-            break;

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

@@ -1017 +1017 @@
-                qFind (storageBusChannels.begin(), storageBusChannels.end(),
-                       aChannel);
-Void
-    
+
+
-            channel = (LONG) (it - storageBusChannels.begin());
-            break;
@@ -1068 +1068 @@
-        case KStorageBus_SATA:
-        {
-Void
+
-            /* always zero so far for SATA */
-            break;
@@ -1105 +1105 @@
-        case KStorageBus_SATA:
-        {
-Void
+
-            /* always zero for SATA so far. */
-            break;