michaelh/zephyr
1
0
Fork 0
Code Releases Activity

sys: util: Deprecate GET_ARG1 macro

Browse source 
GET_ARG_N(1,...) can be used instead.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2020-05-08 10:51:35 +02:00 • committed by Carles Cufí
commit 0afb3445a5
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/clock_control/nrf_power_clock.c
View file

@ -19,7 +19,7 @@ LOG_MODULE_REGISTER(clock_control, CONFIG_CLOCK_CONTROL_LOG_LEVEL);
/* Helper logging macros which prepends subsys name to the log. */ /* Helper logging macros which prepends subsys name to the log. */
#ifdef CONFIG_LOG #ifdef CONFIG_LOG
#define CLOCK_LOG(lvl, dev, subsys, ...) \ #define CLOCK_LOG(lvl, dev, subsys, ...) \
LOG_##lvl("%s: " GET_ARG1(__VA_ARGS__), \ LOG_##lvl("%s: " GET_ARG_N(1, __VA_ARGS__), \
get_sub_config(dev, (enum clock_control_nrf_type)subsys)->name \ get_sub_config(dev, (enum clock_control_nrf_type)subsys)->name \
COND_CODE_0(NUM_VA_ARGS_LESS_1(__VA_ARGS__),\ COND_CODE_0(NUM_VA_ARGS_LESS_1(__VA_ARGS__),\
(), (, GET_ARGS_LESS_1(__VA_ARGS__)))) (), (, GET_ARGS_LESS_1(__VA_ARGS__))))

12
include/logging/log.h
View file

@ -364,7 +364,7 @@ static inline char *log_strdup(const char *str)
#define LOG_MODULE_REGISTER(...) \ #define LOG_MODULE_REGISTER(...) \
Z_LOG_EVAL( \ Z_LOG_EVAL( \
_LOG_LEVEL_RESOLVE(__VA_ARGS__), \ _LOG_LEVEL_RESOLVE(__VA_ARGS__), \
(_LOG_MODULE_DATA_CREATE(GET_ARG1(__VA_ARGS__), \ (_LOG_MODULE_DATA_CREATE(GET_ARG_N(1, __VA_ARGS__), \
_LOG_LEVEL_RESOLVE(__VA_ARGS__))),\ _LOG_LEVEL_RESOLVE(__VA_ARGS__))),\
()/*Empty*/ \ ()/*Empty*/ \
) \ ) \
@ -398,20 +398,22 @@ static inline char *log_strdup(const char *str)
*/ */
#define LOG_MODULE_DECLARE(...) \ #define LOG_MODULE_DECLARE(...) \
extern const struct log_source_const_data \ extern const struct log_source_const_data \
LOG_ITEM_CONST_DATA(GET_ARG1(__VA_ARGS__)); \ LOG_ITEM_CONST_DATA(GET_ARG_N(1, __VA_ARGS__)); \
extern struct log_source_dynamic_data \ extern struct log_source_dynamic_data \
LOG_ITEM_DYNAMIC_DATA(GET_ARG1(__VA_ARGS__)); \ LOG_ITEM_DYNAMIC_DATA(GET_ARG_N(1, __VA_ARGS__)); \
\ \
static const struct log_source_const_data * \ static const struct log_source_const_data * \
__log_current_const_data __unused = \ __log_current_const_data __unused = \
_LOG_LEVEL_RESOLVE(__VA_ARGS__) ? \ _LOG_LEVEL_RESOLVE(__VA_ARGS__) ? \
&LOG_ITEM_CONST_DATA(GET_ARG1(__VA_ARGS__)) : NULL; \ &LOG_ITEM_CONST_DATA(GET_ARG_N(1, __VA_ARGS__)) : \
NULL; \
\ \
static struct log_source_dynamic_data * \ static struct log_source_dynamic_data * \
__log_current_dynamic_data __unused = \ __log_current_dynamic_data __unused = \
(_LOG_LEVEL_RESOLVE(__VA_ARGS__) && \ (_LOG_LEVEL_RESOLVE(__VA_ARGS__) && \
IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) ? \ IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING)) ? \
&LOG_ITEM_DYNAMIC_DATA(GET_ARG1(__VA_ARGS__)) : NULL; \ &LOG_ITEM_DYNAMIC_DATA(GET_ARG_N(1, __VA_ARGS__)) : \
NULL; \
\ \
static const uint32_t __log_level __unused = \ static const uint32_t __log_level __unused = \
_LOG_LEVEL_RESOLVE(__VA_ARGS__) _LOG_LEVEL_RESOLVE(__VA_ARGS__)

2
include/logging/log_core.h
View file

@ -152,7 +152,7 @@ extern "C" {
* used. * used.
*/ */
#define Z_LOG_STR(...) "%s: " GET_ARG1(__VA_ARGS__), __func__\ #define Z_LOG_STR(...) "%s: " GET_ARG_N(1, __VA_ARGS__), __func__\
COND_CODE_0(NUM_VA_ARGS_LESS_1(__VA_ARGS__),\ COND_CODE_0(NUM_VA_ARGS_LESS_1(__VA_ARGS__),\
(),\ (),\
(, GET_ARGS_LESS_1(__VA_ARGS__))\ (, GET_ARGS_LESS_1(__VA_ARGS__))\

7
include/sys/util.h
View file

@ -554,8 +554,11 @@ uint8_t u8_to_dec(char *buf, uint8_t buflen, uint8_t value);
*/ */
#define GET_ARGS_LESS_N(N, ...) _Z_GET_ARG_N(UTIL_INC(N), 0, __VA_ARGS__) #define GET_ARGS_LESS_N(N, ...) _Z_GET_ARG_N(UTIL_INC(N), 0, __VA_ARGS__)
/** @brief Expands to @p arg1 */ /** Expands to the first argument.
#define GET_ARG1(...) GET_ARG_N(1, ) *
* @deprecated Use GET_ARG_N instead.
*/
#define GET_ARG1(...) GET_ARG_N(1, __VA_ARGS__)
/** @brief Expands to @p arg2 */ /** @brief Expands to @p arg2 */
#define GET_ARG2(arg1, arg2, ...) arg2 #define GET_ARG2(arg1, arg2, ...) arg2