Changeset 8573

Timestamp:

05/05/08 15:13:19 (8 months ago)

Author:

vboxsync

Message:

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

Files:

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

trunk/include/iprt/assert.h

@@ -1423 +1423 @@
-#define AssertRCReturnVoid(rc)   AssertMsgRCReturnVoid(rc, ("%Vra\n", (rc)))
-
-
+Stmt
- * 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.
-
-
-
+
+
-
-/** @def AssertRCBreakVoid
@@ -1440 +1439 @@
- * @todo Rename to AssertRCBreak.
- */
-
+    
-
-/** @def AssertMsgRC
@@ -1489 +1488 @@
- * @remark  rc is references multiple times. In release mode is NOREF()'ed.
- */
-
-do { AssertMsgBreakStmt(RT_SUCCESS_NP(rc), msg, stmt); NOREF(rc); 
+Msg
+if (1) { AssertMsgBreakStmt(RT_SUCCESS_NP(rc), msg, stmt); NOREF(rc); } else do {
-
-/** @def AssertMsgRCBreakVoid
@@ -1503 +1502 @@
- */
-#define AssertMsgRCBreakVoid(rc, msg) \
-do { AssertMsgBreakVoid(RT_SUCCESS(rc), msg); NOREF(rc); 
+if (1) { AssertMsgBreakVoid(RT_SUCCESS(rc), msg); NOREF(rc); } else do {
-
-/** @def AssertRCSuccess

trunk/src/VBox/Main/MachineImpl.cpp

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