VirtualBox

Changeset 8572

Show
Ignore:
Timestamp:
05/05/08 14:47:59 (8 months ago)
Author:
vboxsync
Message:

AssertPtrBreak? -> AssertPtrBreakStmt?; a bunch of unused break macros-> *Stmt.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/include/iprt/assert.h

    r8569 r8572  
    10051005 * @param   a   printf argument list (in parenthesis). 
    10061006 * @param   stmt    Statement to execute before break. 
    1007  * @todo Rename to AssertLogRelMsgFailedBreakStmt. 
    10081007 */ 
    10091008#define AssertLogRelMsgFailedBreakStmt(a, stmt) \ 
    …… 
    10851084 
    10861085 
    1087 /** @def AssertReleaseBreak 
     1086/** @def AssertReleaseBreakStmt 
    10881087 * Assert that an expression is true, hit a breakpoing and break if it isn't. 
    10891088 * 
    10901089 * @param   expr    Expression which should be true. 
    10911090 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    1092  * @todo Rename to AssertReleaseBreakStmt. 
    1093  */ 
    1094 #define AssertReleaseBreak(expr, stmt)  \ 
     1091 */ 
     1092#define AssertReleaseBreakStmt(expr, stmt)  \ 
    10951093    do { \ 
    10961094        if (RT_UNLIKELY(!(expr))) \ 
    …… 
    11731171 
    11741172 
    1175 /** @def AssertReleaseMsgBreak 
     1173/** @def AssertReleaseMsgBreakStmt 
    11761174 * Assert that an expression is true, print the message and hit a breakpoing and break if it isn't. 
    11771175 * 
    …… 
    11791177 * @param   a       printf argument list (in parenthesis). 
    11801178 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    1181  * @todo Rename to AssertReleaseMsgBreakStmt. 
    1182  */ 
    1183 #define AssertReleaseMsgBreak(expr, a, stmt)  \ 
     1179 */ 
     1180#define AssertReleaseMsgBreakStmt(expr, a, stmt)  \ 
    11841181    if (RT_UNLIKELY(!(expr))) { \ 
    11851182        AssertMsg1(#expr, __LINE__, __FILE__, __PRETTY_FUNCTION__); \ 
    …… 
    12421239 
    12431240 
    1244 /** @def AssertReleaseFailedBreak 
     1241/** @def AssertReleaseFailedBreakStmt 
    12451242 * An assertion failed, hit a breakpoint and break. 
    12461243 * 
    12471244 * @param   stmt    Statement to execute before break. 
    1248  * @todo Rename to AssertReleaseMsgFailedStmt. 
    1249  */ 
    1250 #define AssertReleaseFailedBreak(stmt)  \ 
     1245 */ 
     1246#define AssertReleaseFailedBreakStmt(stmt)  \ 
    12511247    if (1) { \ 
    12521248        AssertMsg1((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); \ 
    …… 
    13091305 
    13101306 
    1311 /** @def AssertReleaseMsgFailedBreak 
     1307/** @def AssertReleaseMsgFailedBreakStmt 
    13121308 * An assertion failed, print a message, hit a breakpoint and break. 
    13131309 * 
    13141310 * @param   a   printf argument list (in parenthesis). 
    13151311 * @param   stmt    Statement to execute before break. 
    1316  * @todo Rename to AssertReleaseMsgFailedBreakStmt. 
    1317  */ 
    1318 #define AssertReleaseMsgFailedBreak(a, stmt) \ 
     1312 */ 
     1313#define AssertReleaseMsgFailedBreakStmt(a, stmt) \ 
    13191314    if (1) { \ 
    13201315        AssertMsg1((const char *)0, __LINE__, __FILE__, __PRETTY_FUNCTION__); \ 
    …… 
    14361431 * @todo Rename to AssertRCBreakStmt. 
    14371432 */ 
    1438 #define AssertRCBreak(rc, stmt)   AssertMsgRCBreak(rc, ("%Vra\n", (rc)), stmt) 
     1433#define AssertRCBreak(rc, stmt)   AssertRCBreakStmt(rc, ("%Vra\n", (rc)), stmt) 
    14391434 
    14401435/** @def AssertRCBreakVoid 
    …… 
    14841479    do { AssertMsgReturnVoid(RT_SUCCESS_NP(rc), msg); NOREF(rc); } while (0) 
    14851480 
    1486 /** @def AssertMsgRCBreak 
     1481/** @def AssertMsgRCBreakStmt 
    14871482 * Asserts a iprt status code successful and break if it's not. 
    14881483 * 
    …… 
    14931488 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    14941489 * @remark  rc is references multiple times. In release mode is NOREF()'ed. 
    1495  * @todo Rename to AssertMsgRCBreakStmt. 
    1496  */ 
    1497 #define AssertMsgRCBreak(rc, msg, stmt) \ 
     1490 */ 
     1491#define AssertRCBreakStmt(rc, msg, stmt) \ 
    14981492    do { AssertMsgBreakStmt(RT_SUCCESS_NP(rc), msg, stmt); NOREF(rc); } while (0) 
    14991493 
    …… 
    15381532#define AssertRCSuccessReturnVoid(rc)    AssertMsgReturnVoid((rc) == VINF_SUCCESS, ("%Vra\n", (rc))) 
    15391533 
    1540 /** @def AssertRCSuccessBreak 
     1534/** @def AssertRCSuccessBreakStmt 
    15411535 * Asserts that an iprt status code equals VINF_SUCCESS, bitch (RT_STRICT mode only) and break if it isn't. 
    15421536 * 
    …… 
    15441538 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    15451539 * @remark  rc is references multiple times. In release mode is NOREF()'ed. 
    1546  * @todo Rename to AssertRCSuccessBreakStmt. 
    1547  */ 
    1548 #define AssertRCSuccessBreak(rc, stmt)    AssertMsgBreakStmt((rc) == VINF_SUCCESS, ("%Vra\n", (rc)), stmt) 
     1540 */ 
     1541#define AssertRCSuccessBreakStmt(rc, stmt)  AssertMsgBreakStmt((rc) == VINF_SUCCESS, ("%Vra\n", (rc)), stmt) 
    15491542 
    15501543/** @def AssertRCSuccessBreakVoid 
    …… 
    17231716#define AssertReleaseRCReturnVoid(rc) AssertReleaseMsgRCReturnVoid(rc, ("%Vra\n", (rc))) 
    17241717 
    1725 /** @def AssertReleaseRCBreak 
     1718/** @def AssertReleaseRCBreakStmt 
    17261719 * Asserts a iprt status code successful, break if it isn't. 
    17271720 * 
    …… 
    17321725 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    17331726 * @remark  rc is references multiple times. 
    1734  * @todo Rename to AssertReleaseRCBreakStmt. 
    1735  */ 
    1736 #define AssertReleaseRCBreak(rc, stmt) AssertReleaseMsgRCBreak(rc, ("%Vra\n", (rc)), stmt) 
     1727 */ 
     1728#define AssertReleaseRCBreakStmt(rc, stmt)  AssertReleaseMsgRCBreakStmt(rc, ("%Vra\n", (rc)), stmt) 
    17371729 
    17381730/** @def AssertReleaseRCBreakVoid 
    …… 
    17841776#define AssertReleaseMsgRCReturnVoid(rc, msg)    AssertReleaseMsgReturnVoid(RT_SUCCESS_NP(rc), msg) 
    17851777 
    1786 /** @def AssertReleaseMsgRCBreak 
     1778/** @def AssertReleaseMsgRCBreakStmt 
    17871779 * Asserts a iprt status code successful. 
    17881780 * 
    …… 
    17941786 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    17951787 * @remark  rc is references multiple times. 
    1796  * @todo Rename to AssertReleaseMsgRCBreakStmt. 
    1797  */ 
    1798 #define AssertReleaseMsgRCBreak(rc, msg, stmt)    AssertReleaseMsgBreak(RT_SUCCESS_NP(rc), msg, stmt) 
     1788 */ 
     1789#define AssertReleaseMsgRCBreakStmt(rc, msg, stmt)  AssertReleaseMsgBreakStmt(RT_SUCCESS_NP(rc), msg, stmt) 
    17991790 
    18001791/** @def AssertReleaseMsgRCBreakVoid 
    …… 
    18441835#define AssertReleaseRCSuccessReturnVoid(rc)     AssertReleaseMsgReturnVoid((rc) == VINF_SUCCESS, ("%Vra\n", (rc))) 
    18451836 
    1846 /** @def AssertReleaseRCSuccessBreak 
     1837/** @def AssertReleaseRCSuccessBreakStmt 
    18471838 * Asserts that an iprt status code equals VINF_SUCCESS. 
    18481839 * 
    …… 
    18531844 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    18541845 * @remark  rc is references multiple times. 
    1855  * @todo Rename to AssertReleaseRCSuccessBreakStmt. 
    1856  */ 
    1857 #define AssertReleaseRCSuccessBreak(rc, stmt)     AssertReleaseMsgBreak((rc) == VINF_SUCCESS, ("%Vra\n", (rc)), stmt) 
     1846 */ 
     1847#define AssertReleaseRCSuccessBreakStmt(rc, stmt)   AssertReleaseMsgBreakStmt((rc) == VINF_SUCCESS, ("%Vra\n", (rc)), stmt) 
    18581848 
    18591849/** @def AssertReleaseRCSuccessBreakVoid 
    …… 
    19221912 * @param   pv      The pointer. 
    19231913 */ 
    1924 #define AssertPtrReturnVoid(pv)  AssertMsgReturnVoid(VALID_PTR(pv), ("%p\n", (pv))) 
    1925  
    1926 /** @def AssertPtrBreak 
     1914#define AssertPtrReturnVoid(pv)     AssertMsgReturnVoid(VALID_PTR(pv), ("%p\n", (pv))) 
     1915 
     1916/** @def AssertPtrBreakStmt 
    19271917 * Asserts that a pointer is valid. 
    19281918 * 
    19291919 * @param   pv      The pointer. 
    19301920 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    1931  * @todo Rename to AssertPtrBreakStmt. 
    1932  */ 
    1933 #define AssertPtrBreak(pv, stmt)  AssertMsgBreakStmt(VALID_PTR(pv), ("%p\n", (pv)), stmt) 
    1934 #define AssertPtrBreakStmt(pv, stmt)  AssertMsgBreakStmt(VALID_PTR(pv), ("%p\n", (pv)), stmt) 
     1921 */ 
     1922#define AssertPtrBreakStmt(pv, stmt)    AssertMsgBreakStmt(VALID_PTR(pv), ("%p\n", (pv)), stmt) 
    19351923 
    19361924/** @def AssertPtrBreakVoid 
    …… 
    19641952#define AssertPtrNullReturnVoid(pv)  AssertMsgReturnVoid(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv))) 
    19651953 
    1966 /** @def AssertPtrNullBreak 
     1954/** @def AssertPtrNullBreakStmt 
    19671955 * Asserts that a pointer is valid or NULL. 
    19681956 * 
    19691957 * @param   pv      The pointer. 
    19701958 * @param   stmt    Statement to execute before break in case of a failed assertion. 
    1971  * @todo Rename to AssertPtrNullBreakStmt. 
    1972  */ 
    1973 #define AssertPtrNullBreak(pv, stmt)  AssertMsgBreakStmt(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)), stmt) 
     1959 */ 
     1960#define AssertPtrNullBreakStmt(pv, stmt)    AssertMsgBreakStmt(VALID_PTR(pv) || (pv) == NULL, ("%p\n", (pv)), stmt) 
    19741961 
    19751962/** @def AssertPtrNullBreakVoid 

  • trunk/src/VBox/Main/MachineImpl.cpp

    r8570 r8572  
    31523152 
    31533153            newEnvStr = RTStrDup(Utf8Str (aEnvironment)); 
    3154             AssertPtrBreak (newEnvStr, vrc = vrc2); 
     3154            AssertPtrBreakStmt (newEnvStr, vrc = vrc2); 
    31553155 
    31563156            /* put new variables to the environment 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy