From: Alex Kiernan Date: Thu, 19 Apr 2018 04:32:56 +0000 (+0000) Subject: Consolidate __assert_failed into one implementation X-Git-Tag: v2018.05-rc3~9 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e21c03be6d51ed8ab94885b6829cd0e719778a1e;p=u-boot Consolidate __assert_failed into one implementation We had two implementations of __assert_failed which were almost identical, combine them into one. Signed-off-by: Alex Kiernan --- diff --git a/lib/panic.c b/lib/panic.c index 0efa134344..bae8a35935 100644 --- a/lib/panic.c +++ b/lib/panic.c @@ -45,3 +45,11 @@ void panic(const char *fmt, ...) #endif panic_finish(); } + +void __assert_fail(const char *assertion, const char *file, unsigned int line, + const char *function) +{ + /* This will not return */ + panic("%s:%u: %s: Assertion `%s' failed.", file, line, function, + assertion); +} diff --git a/lib/tiny-printf.c b/lib/tiny-printf.c index e29377e000..5f7e27d76e 100644 --- a/lib/tiny-printf.c +++ b/lib/tiny-printf.c @@ -383,12 +383,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 9f0ce8aa79..8514f50498 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -827,14 +827,6 @@ int vprintf(const char *fmt, va_list args) } #endif -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 */