michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: Fix checks of Kconfig options

Browse source 
The compiler was generating errors of the form
error: "CONFIG_LOG" is not defined, evaluates to 0 [-Werror=undef]
when -Wundef is used and the config option was turned off.  Change
several #if checks to #ifdef.

Signed-off-by: Bradley Bolen <bbolen@lexmark.com>
This commit is contained in:
Bradley Bolen 2019-05-13 16:37:11 -04:00 • committed by Andrew Boie
commit 3c0c1bfa8d
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/shell/shell.h
View file

@ -500,7 +500,7 @@ struct shell_stats {
u32_t log_lost_cnt; /*!< Lost log counter.*/ u32_t log_lost_cnt; /*!< Lost log counter.*/
}; };
#if CONFIG_SHELL_STATS #ifdef CONFIG_SHELL_STATS
#define SHELL_STATS_DEFINE(_name) static struct shell_stats _name##_stats #define SHELL_STATS_DEFINE(_name) static struct shell_stats _name##_stats
#define SHELL_STATS_PTR(_name) (&(_name##_stats)) #define SHELL_STATS_PTR(_name) (&(_name##_stats))
#else #else

2
include/shell/shell_history.h
View file

@ -29,7 +29,7 @@ struct shell_history_item {
char data[]; char data[];
}; };
#if CONFIG_SHELL_HISTORY #ifdef CONFIG_SHELL_HISTORY
#define SHELL_HISTORY_DEFINE(_name, block_size, block_count) \ #define SHELL_HISTORY_DEFINE(_name, block_size, block_count) \
\ \
K_MEM_SLAB_DEFINE(_name##_history_memslab, \ K_MEM_SLAB_DEFINE(_name##_history_memslab, \

2
include/shell/shell_log_backend.h
View file

@ -64,7 +64,7 @@ int shell_log_backend_output_func(u8_t *data, size_t length, void *ctx);
* *
* @param _name Shell name. * @param _name Shell name.
*/ */
#if CONFIG_LOG #ifdef CONFIG_LOG
#define SHELL_LOG_BACKEND_DEFINE(_name, _buf, _size, _queue_size, _timeout) \ #define SHELL_LOG_BACKEND_DEFINE(_name, _buf, _size, _queue_size, _timeout) \
LOG_BACKEND_DEFINE(_name##_backend, log_backend_shell_api, false); \ LOG_BACKEND_DEFINE(_name##_backend, log_backend_shell_api, false); \
K_MSGQ_DEFINE(_name##_msgq, sizeof(struct shell_log_backend_msg), \ K_MSGQ_DEFINE(_name##_msgq, sizeof(struct shell_log_backend_msg), \