From 18172005ce59dfb657c47833b0d752ad20469197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Kijewski?= Date: Thu, 27 Aug 2015 01:49:51 +0200 Subject: [PATCH] core: define assertion failed message in one place --- core/include/assert.h | 4 +++- core/panic.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/include/assert.h b/core/include/assert.h index 80742fb5e7494..c2d75bfab6a3d 100644 --- a/core/include/assert.h +++ b/core/include/assert.h @@ -25,6 +25,8 @@ extern "C" { #endif +extern const char assert_crash_message[]; + /** * @brief abort the program if assertion is false * @@ -41,7 +43,7 @@ extern "C" { #ifdef NDEBUG #define assert(ignore)((void) 0) #else -#define assert(cond) ((cond) ? (void)0 : core_panic(PANIC_ASSERT_FAIL, "assert")) +#define assert(cond) ((cond) ? (void)0 : core_panic(PANIC_ASSERT_FAIL, assert_crash_message)) #endif #ifdef __cplusplus diff --git a/core/panic.c b/core/panic.c index 299fdd3be9c46..99905a06b696a 100644 --- a/core/panic.c +++ b/core/panic.c @@ -24,6 +24,7 @@ #include #include +#include "assert.h" #include "cpu.h" #include "irq.h" #include "lpm.h" @@ -34,6 +35,8 @@ #include "ps.h" #endif +const char assert_crash_message[] = "Failed assertion."; + /* flag preventing "recursive crash printing loop" */ static int crashed = 0;