andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc: fix sparse warning for __assert() 

Sparse warns this:

lib/libc/assert.c:29:6: error: symbol '__assert' redeclared with different type (originally declared at include/lib/libc/assert.h:36) - different modifiers

Add __dead2 to match the header declaration and C definition.

I also changed '__dead2 void' to 'void __dead2' for the consistency
with other parts.

Change-Id: Iefa4f0e787c24fa7e7e499d2e7baf54d4deb49ef
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2019-07-26 20:21:39 +09:00
parent 5dbdf8e4ea
commit f906a44e9e
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/lib/libc/assert.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -30,12 +30,12 @@
#endif /* ENABLE_ASSERTIONS */ #endif /* ENABLE_ASSERTIONS */
#if PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_VERBOSE #if PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_VERBOSE
__dead2 void __assert(const char *file, unsigned int line, void __dead2 __assert(const char *file, unsigned int line,
const char *assertion); const char *assertion);
#elif PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_INFO #elif PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_INFO
__dead2 void __assert(const char *file, unsigned int line); void __dead2 __assert(const char *file, unsigned int line);
#else #else
__dead2 void __assert(void); void __dead2 __assert(void);
#endif #endif
#endif /* ASSERT_H */ #endif /* ASSERT_H */

9
lib/libc/assert.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -18,7 +18,8 @@
*/ */
#if PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_VERBOSE #if PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_VERBOSE
void __assert(const char *file, unsigned int line, const char *assertion) void __dead2 __assert(const char *file, unsigned int line,
const char *assertion)
{ {
printf("ASSERT: %s:%d:%s\n", file, line, assertion); printf("ASSERT: %s:%d:%s\n", file, line, assertion);
backtrace("assert"); backtrace("assert");
@ -26,7 +27,7 @@ void __assert(const char *file, unsigned int line, const char *assertion)
plat_panic_handler(); plat_panic_handler();
} }
#elif PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_INFO #elif PLAT_LOG_LEVEL_ASSERT >= LOG_LEVEL_INFO
void __assert(const char *file, unsigned int line) void __dead2 __assert(const char *file, unsigned int line)
{ {
printf("ASSERT: %s:%d\n", file, line); printf("ASSERT: %s:%d\n", file, line);
backtrace("assert"); backtrace("assert");
@ -34,7 +35,7 @@ void __assert(const char *file, unsigned int line)
plat_panic_handler(); plat_panic_handler();
} }
#else #else
void __assert(void) void __dead2 __assert(void)
{ {
backtrace("assert"); backtrace("assert");
(void)console_flush(); (void)console_flush();