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 <alex.kiernan@gmail.com>

diff --git a/lib/panic.c b/lib/panic.c
index 0efa134344519f0144523f076e123b22f9118dcc..bae8a359354216e7b8117d4364af872ebdebbd61 100644 (file)
--- 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 e29377e0004dd09a1d06f966b7936498e6207402..5f7e27d76edf695216b46454725a9055b2d6dc25 100644 (file)
--- 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 9f0ce8aa7980256dd3ce79dd9503058cd16c9937..8514f504988ea94119d8774c130ecdbfc5247e67 100644 (file)
--- 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 */