Changeset 8687 in vbox for trunk/include/VBox

Timestamp:

May 7, 2008 9:42:51 PM (17 years ago)

Author:

vboxsync

Message:

Use %Rhra instead of %Rwa. Dropped surpurfluous if (1)s.

File:

• trunk/include/VBox/com/assert.h (modified) (13 diffs)

trunk/include/VBox/com/assert.h

@@ -41 +41 @@
  */
 #define AssertComRC(rc)      \
-    do { AssertMsg (SUCCEEDED (rc), ("COM RC = 0x%08X\n", rc)); NOREF (rc); } while (0)
+    do { AssertMsg (SUCCEEDED (rc), ("COM RC = %Rhrc (0x%08X)\n", rc, rc)); NOREF (rc); } while (0)
 
 /**
@@ -51 +51 @@
  */
 #define AssertComRCReturn(rc, ret)      \
-    AssertMsgReturn (SUCCEEDED (rc), ("COM RC = 0x%08X\n", rc), ret)
+    AssertMsgReturn (SUCCEEDED (rc), ("COM RC = %Rhrc (0x%08X)\n", rc, rc), ret)
 
 /**
@@ -61 +61 @@
  */
 #define AssertComRCReturnRC(rc)         \
-    AssertMsgReturn (SUCCEEDED (rc), ("COM RC = 0x%08X\n", rc), rc)
+    AssertMsgReturn (SUCCEEDED (rc), ("COM RC = %Rhrc (0x%08X)\n", rc, rc), rc)
 
 /**
@@ -70 +70 @@
  */
 #define AssertComRCReturnVoid(rc)      \
-    AssertMsgReturnVoid (SUCCEEDED (rc), ("COM RC = 0x%08X\n", rc))
+    AssertMsgReturnVoid (SUCCEEDED (rc), ("COM RC = %Rhrc (0x%08X)\n", rc, rc))
 
 /**
@@ -80 +80 @@
  */
 #define AssertComRCBreak(rc, eval)      \
-    if (1) { AssertComRC (rc); if (!SUCCEEDED (rc)) { eval; break; } } else do {} while (0)
+    if (!SUCCEEDED (rc)) { AssertComRC (rc); eval; break; } else do {} while (0)
 
 /**
@@ -87 +87 @@
  *
  *  @param rc   COM result code
- *  @param eval the expression to evaluate
+ *  @param eval the expression to throw
  */
 #define AssertComRCThrow(rc, eval)      \
-    if (1) { AssertComRC (rc); if (!SUCCEEDED (rc)) { throw (eval); } } else do {} while (0)
+    if (!SUCCEEDED (rc)) { AssertComRC (rc); throw (eval); } else do {} while (0)
 
 /**
@@ -99 +99 @@
  */
 #define AssertComRCBreakRC(rc)          \
-    if (1) { AssertComRC (rc); if (!SUCCEEDED (rc)) { break; } } else do {} while (0)
+    if (!SUCCEEDED (rc)) { AssertComRC (rc); break; } else do {} while (0)
 
 /**
@@ -108 +108 @@
  */
 #define AssertComRCThrowRC(rc)          \
-    if (1) { AssertComRC (rc); if (!SUCCEEDED (rc)) { throw rc; } } else do {} while (0)
+    if (!SUCCEEDED (rc)) { AssertComRC (rc); throw rc; } else do {} while (0)
 
 /**
@@ -117 +117 @@
  */
 #define CheckComRCReturnRC(rc)      \
-    if (1) { if (!SUCCEEDED (rc)) return (rc); } else do {} while (0)
+    if (!SUCCEEDED (rc)) { return (rc); } else do {} while (0)
 
 /**
@@ -126 +126 @@
  */
 #define CheckComRCBreakRC(rc)      \
-    if (1) { if (!SUCCEEDED (rc)) { break; } } else do {} while (0)
+    if (!SUCCEEDED (rc)) { break; } else do {} while (0)
 
 /**
@@ -135 +135 @@
  */
 #define CheckComRCThrowRC(rc)      \
-    if (1) { if (!SUCCEEDED (rc)) { throw rc; } } else do {} while (0)
+    if (!SUCCEEDED (rc)) { throw rc; } else do {} while (0)
 
 /*
@@ -147 +147 @@
 #define PRINT_RC_MESSAGE(rc) \
     do { \
-        RTPrintf ("[!] Primary RC  = %Rwa\n", rc); \
-        Log (("[!] Primary RC  = %Rwa\n", rc)); \
+        RTPrintf ("[!] Primary RC  = %Rhra\n", rc); \
+        Log (("[!] Primary RC  = %Rhra\n", rc)); \
     } while (0)
 
@@ -164 +164 @@
               info.isFullAvailable(), info.isBasicAvailable())); \
         if (info.isFullAvailable() || info.isBasicAvailable()) { \
-            RTPrintf ("[!] Result Code = %Rwa\n", info.getResultCode()); \
+            RTPrintf ("[!] Result Code = %Rhra\n", info.getResultCode()); \
             RTPrintf ("[!] Text        = %ls\n", info.getText().raw()); \
-            RTPrintf ("[!] Component   = %ls, Interface: %ls, {%Vuuid}\n", \
+            RTPrintf ("[!] Component   = %ls, Interface: %ls, {%RTuuid}\n", \
                       info.getComponent().raw(), info.getInterfaceName().raw(), \
                       info.getInterfaceID().raw()); \
-            RTPrintf ("[!] Callee      = %ls, {%Vuuid}\n", \
+            RTPrintf ("[!] Callee      = %ls, {%RTuuid}\n", \
                       info.getCalleeName().raw(), info.getCalleeIID().raw()); \
-            Log (("[!] Result Code = %Rwa\n", info.getResultCode())); \
+            Log (("[!] Result Code = %Rhra\n", info.getResultCode())); \
             Log (("[!] Text        = %ls\n", info.getText().raw())); \
-            Log (("[!] Component   = %ls, Interface: %ls, {%Vuuid}\n", \
+            Log (("[!] Component   = %ls, Interface: %ls, {%RTuuid}\n", \
                   info.getComponent().raw(), info.getInterfaceName().raw(), \
                   info.getInterfaceID().raw())); \
-            Log (("[!] Callee      = %ls, {%Vuuid}\n", \
+            Log (("[!] Callee      = %ls, {%RTuuid}\n", \
                   info.getCalleeName().raw(), info.getCalleeIID().raw())); \
         } \