diff options
Diffstat (limited to 'libmisc/include')
| -rw-r--r-- | libmisc/include/libmisc/assert.h | 18 | ||||
| -rw-r--r-- | libmisc/include/libmisc/log.h | 3 |
2 files changed, 12 insertions, 9 deletions
diff --git a/libmisc/include/libmisc/assert.h b/libmisc/include/libmisc/assert.h index 525d7d5..92b9a51 100644 --- a/libmisc/include/libmisc/assert.h +++ b/libmisc/include/libmisc/assert.h @@ -8,16 +8,18 @@ #define _LIBMISC_ASSERT_H_ #ifdef NDEBUG -# define assert_msg(expr, msg) ((void)0) +# define __assert_msg(expr, expr_str, msg) ((void)0) #else -# define assert_msg(expr, msg) do { if (!(expr)) __assert_msg_fail(#expr, __FILE__, __LINE__, __func__, msg); } while (0) -void __assert_msg_fail(const char *expr, - const char *file, unsigned int line, const char *func, - const char *msg); +# define __assert_msg(expr, expr_str, msg) do { if (!(expr)) __assert_msg_fail(expr_str, __FILE__, __LINE__, __func__, msg); } while (0) +__attribute__((noreturn)) void +__assert_msg_fail(const char *expr, + const char *file, unsigned int line, const char *func, + const char *msg); #endif -#define assert(expr) assert_msg(expr, NULL) /* C89, POSIX-2001 */ -#define assert_notreached(msg) do { assert_msg(0, msg); __builtin_unreachable(); } while (0) -#define static_assert _Static_assert /* C11 */ +#define assert_msg(expr, msg) __assert_msg(expr, #expr, msg) /* libmisc */ +#define assert(expr) __assert_msg(expr, #expr, NULL) /* C89, POSIX-2001 */ +#define assert_notreached(msg) do { __assert_msg(0, "notreached", msg); __builtin_unreachable(); } while (0) /* libmisc */ +#define static_assert _Static_assert /* C11 */ #endif /* _LIBMISC_ASSERT_H_ */ diff --git a/libmisc/include/libmisc/log.h b/libmisc/include/libmisc/log.h index eb9db3b..85b2201 100644 --- a/libmisc/include/libmisc/log.h +++ b/libmisc/include/libmisc/log.h @@ -16,7 +16,8 @@ #else #define _LOG_NDEBUG 0 #endif -#define _LOG_STR(x) #x +#define __LOG_STR(x) #x +#define _LOG_STR(x) __LOG_STR(x) #define __LOG_CAT3(a, b, c) a ## b ## c #define _LOG_CAT3(a, b, c) __LOG_CAT3(a, b, c) |