diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-12-02 08:41:31 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-12-02 09:01:20 -0800 |
| commit | 255495581f4bcc5289759197e5aa160462d64709 (patch) | |
| tree | c51aa1f1bd4ca03875df22e7fa84976bac0348f1 | |
| parent | ac339c5000fb138eb4abf89df63a8cec6ccde4c0 (diff) | |
| download | quagga-255495581f4bcc5289759197e5aa160462d64709.tar.bz2 quagga-255495581f4bcc5289759197e5aa160462d64709.tar.xz | |
Fix inversion of likely/unlikely in assert
| -rw-r--r-- | lib/zassert.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/zassert.h b/lib/zassert.h index 123aee16..c5892b8c 100644 --- a/lib/zassert.h +++ b/lib/zassert.h @@ -9,14 +9,6 @@ extern void _zlog_assert_failed (const char *assertion, const char *file, unsigned int line, const char *function) __attribute__ ((noreturn)); -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define __ASSERT_FUNCTION __func__ -#elif defined(__GNUC__) -#define __ASSERT_FUNCTION __FUNCTION__ -#else -#define __ASSERT_FUNCTION NULL -#endif - #ifdef __GNUC__ #define UNLIKELY(EX) __builtin_expect(!!(EX), 0) #define LIKELY(EX) __builtin_expect(!!(EX), 1) @@ -25,9 +17,9 @@ extern void _zlog_assert_failed (const char *assertion, const char *file, #define LIKELY(EX) (EX) #endif -#define zassert(EX) ((void)(UNLIKELY(EX) ? 0 : \ - (_zlog_assert_failed(#EX, __FILE__, __LINE__, \ - __ASSERT_FUNCTION), 0))) +#define zassert(EX) ((void)(LIKELY(EX) ? 0 : \ + _zlog_assert_failed(#EX, __FILE__, __LINE__, \ + __func__))) #undef assert #define assert(EX) zassert(EX) |