[v2,5/5] Remove assert()

Message ID 1512358624-6309-6-git-send-email-yamada.masahiro@socionext.com
State Superseded
Headers show
Series
  • Remove assert()
Related show

Commit Message

Masahiro Yamada Dec. 4, 2017, 3:37 a.m.
No more users of assert() except host tools.  Remove.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

Changes in v2: None

 include/common.h  | 15 ---------------
 lib/tiny-printf.c |  9 ---------
 lib/vsprintf.c    |  9 ---------
 3 files changed, 33 deletions(-)

Comments

Simon Glass Dec. 12, 2017, 4:38 a.m. | #1
On 3 December 2017 at 20:37, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> No more users of assert() except host tools.  Remove.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>
> Changes in v2: None
>
>  include/common.h  | 15 ---------------
>  lib/tiny-printf.c |  9 ---------
>  lib/vsprintf.c    |  9 ---------
>  3 files changed, 33 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

Patch

diff --git a/include/common.h b/include/common.h
index 6e24545..f035f76 100644
--- a/include/common.h
+++ b/include/common.h
@@ -76,21 +76,6 @@  typedef volatile unsigned char	vu_char;
 #define warn_non_spl(fmt, args...)			\
 	debug_cond(!_SPL_BUILD, fmt, ##args)
 
-/*
- * An assertion is run-time check done in debug mode only. If DEBUG is not
- * defined then it is skipped. If DEBUG is defined and the assertion fails,
- * then it calls panic*( which may or may not reset/halt U-Boot (see
- * CONFIG_PANIC_HANG), It is hoped that all failing assertions are found
- * before release, and after release it is hoped that they don't matter. But
- * in any case these failing assertions cannot be fixed with a reset (which
- * may just do the same assertion again).
- */
-void __assert_fail(const char *assertion, const char *file, unsigned line,
-		   const char *function);
-#define assert(x) \
-	({ if (!(x) && _DEBUG) \
-		__assert_fail(#x, __FILE__, __LINE__, __func__); })
-
 typedef void (interrupt_handler_t)(void *);
 
 #include <asm/u-boot.h> /* boot information for Linux kernel */
diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c
index 0b04813..d5b6d69 100644
--- a/lib/tiny-printf.c
+++ b/lib/tiny-printf.c
@@ -381,12 +381,3 @@  int snprintf(char *buf, size_t size, const char *fmt, ...)
 
 	return ret;
 }
-
-void __assert_fail(const char *assertion, const char *file, unsigned line,
-		   const char *function)
-{
-	/* This will not return */
-	printf("%s:%u: %s: Assertion `%s' failed.", file, line, function,
-	       assertion);
-	hang();
-}
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index dd572d2..4208239 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -789,15 +789,6 @@  int vprintf(const char *fmt, va_list args)
 	return i;
 }
 
-
-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);
-}
-
 char *simple_itoa(ulong i)
 {
 	/* 21 digits plus null terminator, good for 64-bit or smaller ints */