From 21726a7afce16b882b5cedf70a0c112caea945be Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 29 Jun 2011 09:49:34 +0000 Subject: Add assert() for debug assertions assert() is like BUG_ON() but compiles to nothing unless DEBUG is defined. This is useful when a condition is an error but a board reset is unlikely to fix it, so it is better to soldier on in hope. Assertion failures should be caught during development/test. It turns out that assert() is defined separately in a few places in U-Boot with various meanings. This patch cleans up some of these. Build errors exposed by this change (and defining DEBUG) are also fixed in this patch. Signed-off-by: Simon Glass --- lib/qsort.c | 5 ----- lib/vsprintf.c | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/qsort.c b/lib/qsort.c index 1cc0d31c9e..86c392c225 100644 --- a/lib/qsort.c +++ b/lib/qsort.c @@ -17,11 +17,6 @@ #include #include -#if 0 -#include -#else -#define assert(arg) -#endif void qsort(void *base, size_t nel, diff --git a/lib/vsprintf.c b/lib/vsprintf.c index c029fbbc48..79dead3996 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -730,3 +730,11 @@ void panic(const char *fmt, ...) while (1) ; } + +void __assert_fail(const char *assertion, const char *file, unsigned line, + const char *function) +{ + /* This will not return */ + panic("%s:%u: %s: Assertion `%s' failed.", file, line, function, + assertion); +} -- cgit v1.2.3