Merge pull request #7 from Kijewski/RIOT_assert

core: define assertion failed message in one place
OlegHahm · Aug 29, 2015 · b3a6af6 · b3a6af6
2 parents f604738 + 1817200
commit b3a6af6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <stdio.h>
 
+#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;