patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

logging: move _is_user_context() check down one level

Browse source 
MISRA-C Directive 4.7 says that error information returned from
a function needs to be tested. In the logging macros,
return from _is_user_context() is not needed until logging is
enabled and above minimal logging level. There is a potential
that the return is not being used at all. So move it one level
below as it is surely being used within the if block.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2020-07-28 13:38:17 -07:00 committed by Anas Nashif
parent 9ca3f61947
commit 79b044b61b
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/logging/log_core.h
View file

@ -259,9 +259,9 @@ static inline char z_log_minimal_level_to_char(int level)
/******************************************************************************/
#define __LOG(_level, _id, _filter, ...) \
do { \
bool is_user_context = _is_user_context(); \
\
if (Z_LOG_CONST_LEVEL_CHECK(_level)) { \
bool is_user_context = _is_user_context(); \
\
if (IS_ENABLED(CONFIG_LOG_MINIMAL)) { \
Z_LOG_TO_PRINTK(_level, __VA_ARGS__); \
} else if (is_user_context || \
@ -312,9 +312,9 @@ static inline char z_log_minimal_level_to_char(int level)
/******************************************************************************/
#define __LOG_HEXDUMP(_level, _id, _filter, _data, _length, _str) \
do { \
bool is_user_context = _is_user_context(); \
\
if (Z_LOG_CONST_LEVEL_CHECK(_level)) { \
bool is_user_context = _is_user_context(); \
\
if (IS_ENABLED(CONFIG_LOG_MINIMAL)) { \
Z_LOG_TO_PRINTK(_level, "%s", _str); \
log_minimal_hexdump_print(_level, \
@ -715,9 +715,9 @@ __syscall void z_log_hexdump_from_user(uint32_t src_level_val,
#define __LOG_VA(_level, _id, _filter, _str, _valist, _argnum, _strdup_action) \
do { \
bool is_user_context = _is_user_context(); \
\
if (Z_LOG_CONST_LEVEL_CHECK(_level)) { \
bool is_user_context = _is_user_context(); \
\
if (IS_ENABLED(CONFIG_LOG_MINIMAL)) { \
if (IS_ENABLED(CONFIG_LOG_PRINTK)) { \
log_printk(_str, _valist); \