Changeset 8573 in vbox

Timestamp:

May 5, 2008 1:13:19 PM (17 years ago)

Author:

vboxsync

Message:

AssertRCBreak -> AssertRCBreakStmt; Fixed broken AssertMsgRCBreakStmt, AssertMsgRCBreakVoid and AssertRCBreakVoid.

Location:

trunk

Files:

• include/iprt/assert.h (modified) (5 diffs)
• src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)

trunk/include/iprt/assert.h

@@ -1423 +1423 @@
 #define AssertRCReturnVoid(rc)   AssertMsgRCReturnVoid(rc, ("%Vra\n", (rc)))
 
-/** @def AssertRCBreak
+/** @def AssertRCBreakStmt
  * Asserts a iprt status code successful, bitch (RT_STRICT mode only) and break if it isn't.
  *
@@ -1429 +1429 @@
  * @param   stmt    Statement to execute before break in case of a failed assertion.
  * @remark  rc is references multiple times. In release mode is NOREF()'ed.
- * @todo Rename to AssertRCBreakStmt.
- */
-#define AssertRCBreak(rc, stmt)   AssertRCBreakStmt(rc, ("%Vra\n", (rc)), stmt)
+ */
+#define AssertRCBreakStmt(rc, stmt) AssertMsgRCBreakStmt(rc, ("%Vra\n", (rc)), stmt)
 
 /** @def AssertRCBreakVoid
@@ -1440 +1439 @@
  * @todo Rename to AssertRCBreak.
  */
-#define AssertRCBreakVoid(rc)   AssertMsgRCBreakVoid(rc, ("%Vra\n", (rc)))
+#define AssertRCBreakVoid(rc)       AssertMsgRCBreakVoid(rc, ("%Vra\n", (rc)))
 
 /** @def AssertMsgRC
@@ -1489 +1488 @@
  * @remark  rc is references multiple times. In release mode is NOREF()'ed.
  */
-#define AssertRCBreakStmt(rc, msg, stmt) \
-    do { AssertMsgBreakStmt(RT_SUCCESS_NP(rc), msg, stmt); NOREF(rc); } while (0)
+#define AssertMsgRCBreakStmt(rc, msg, stmt) \
+    if (1) { AssertMsgBreakStmt(RT_SUCCESS_NP(rc), msg, stmt); NOREF(rc); } else do {} while (0)
 
 /** @def AssertMsgRCBreakVoid
@@ -1503 +1502 @@
  */
 #define AssertMsgRCBreakVoid(rc, msg) \
-    do { AssertMsgBreakVoid(RT_SUCCESS(rc), msg); NOREF(rc); } while (0)
+    if (1) { AssertMsgBreakVoid(RT_SUCCESS(rc), msg); NOREF(rc); } else do {} while (0)
 
 /** @def AssertRCSuccess

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3149 +3149 @@
             /* clone the current environment */
             int vrc2 = RTEnvClone (&env, RTENV_DEFAULT);
-            AssertRCBreak (vrc2, vrc = vrc2);
+            AssertRCBreakStmt (vrc2, vrc = vrc2);
 
             newEnvStr = RTStrDup(Utf8Str (aEnvironment));
@@ -3182 +3182 @@
                 vrc2 = RTEnvPutEx (env, var);
 
-            AssertRCBreak (vrc2, vrc = vrc2);
+            AssertRCBreakStmt (vrc2, vrc = vrc2);
         }
         while (0);