sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

assert: change the do-while of assert to a conditional expression

Browse Source 
According to the standard definition, assert should return a void expression
https://pubs.opengroup.org/onlinepubs/007904875/basedefs/assert.h.html

This patch involves two changes:

If you define the NDEBUG macro, assert does not use any parameters and directly returns a void expression.
assert should return a void expression and cannot use do-while statements.
If the following code , a compilation error will occur.

Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2023-10-18 22:24:21 +08:00 committed by Alan Carvalho de Assis
parent 97724cbe6c
commit 23aba6c2a1
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/assert.h
View File

@ -77,20 +77,10 @@
__ASSERT_LINE__, msg, regs)
#define __ASSERT__(f, file, line, _f) \
do \
{ \
if (predict_false(!(f))) \
__assert(file, line, _f); \
} \
while (0)
(predict_false(!(f))) ? __assert(file, line, _f) : ((void)0)
#define __VERIFY__(f, file, line, _f) \
do \
{ \
if (predict_false((f) < 0)) \
__assert(file, line, _f); \
} \
while (0)
(predict_false((f) < 0)) ? __assert(file, line, _f) : ((void)0)
#ifdef CONFIG_DEBUG_ASSERTIONS_EXPRESSION
# define _ASSERT(f,file,line) __ASSERT__(f, file, line, #f)