Bug 392055: NS_ENSURE_SUCCESS should print out the error code. Original patch by Shawn Wilsher (sdwilsh) <comrade693+bmo@gmail.com>, updated by me to handle the standalone xpcom glue case and to use printf safely. r=bsmedberg, sr=bzbarsky, a=dsicore.

This commit is contained in:
jag@tty.nl 2007-09-28 11:59:07 -07:00
parent 1667a68178
commit 8bd7c5cef0

View File

@ -50,6 +50,7 @@
#ifdef DEBUG
#define NS_DEBUG
#include "prprf.h"
#endif
#ifdef DEBUG
@ -203,8 +204,29 @@
** Macros for checking results
******************************************************************************/
#define NS_ENSURE_SUCCESS(res, ret) \
NS_ENSURE_TRUE(NS_SUCCEEDED(res), ret)
#if defined(DEBUG) && !defined(XPCOM_GLUE_AVOID_NSPR)
#define NS_ENSURE_SUCCESS_BODY(res, ret) \
char *msg = PR_smprintf("NS_ENSURE_SUCCESS(%s, %s) failed with " \
"result 0x%X", #res, #ret, __rv); \
NS_WARNING(msg); \
PR_smprintf_free(msg);
#else
#define NS_ENSURE_SUCCESS_BODY(res, ret) \
NS_WARNING("NS_ENSURE_SUCCESS(" #res ", " #ret ") failed");
#endif
#define NS_ENSURE_SUCCESS(res, ret) \
PR_BEGIN_MACRO \
nsresult __rv = res; /* Don't evaluate |res| more than once */ \
if (NS_FAILED(__rv)) { \
NS_ENSURE_SUCCESS_BODY(res, ret) \
return ret; \
} \
PR_END_MACRO
/******************************************************************************
** Macros for checking state and arguments upon entering interface boundaries