linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

Consolidate __assert_failed into one implementation

Browse Source 
We had two implementations of __assert_failed which were almost identical,
combine them into one.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
This commit is contained in:
Alex Kiernan
2018-04-19 04:32:56 +00:00
committed by Tom Rini
parent 4f1eed7527
commit e21c03be6d
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/panic.c
View File

@ -45,3 +45,11 @@ void panic(const char *fmt, ...)
#endif #endif
panic_finish(); 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);
}

9
lib/tiny-printf.c
View File

@ -383,12 +383,3 @@ int snprintf(char *buf, size_t size, const char *fmt, ...)
return ret; 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();
}

8
lib/vsprintf.c
View File

@ -827,14 +827,6 @@ int vprintf(const char *fmt, va_list args)
} }
#endif #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) char *simple_itoa(ulong i)
{ {
/* 21 digits plus null terminator, good for 64-bit or smaller ints */ /* 21 digits plus null terminator, good for 64-bit or smaller ints */