From 1f1d4d42c1073f03cbfbc7f72b735a34a22efb63 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 2 Dec 2020 15:15:50 +0900 Subject: [PATCH] log-link: introduce log_interface_full_errno() macro --- src/shared/log-link.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/shared/log-link.h b/src/shared/log-link.h index bb692e0518..3a4dcaa267 100644 --- a/src/shared/log-link.h +++ b/src/shared/log-link.h @@ -3,6 +3,13 @@ #include "log.h" +#define log_interface_full_errno(ifname, level, error, ...) \ + ({ \ + const char *_ifname = (ifname); \ + _ifname ? log_object_internal(level, error, PROJECT_FILE, __LINE__, __func__, "INTERFACE=", _ifname, NULL, NULL, ##__VA_ARGS__) : \ + log_internal(level, error, PROJECT_FILE, __LINE__, __func__, ##__VA_ARGS__); \ + }) + /* * The following macros append INTERFACE= to the message. * The macros require a struct named 'Link' which contains 'char *ifname': @@ -17,9 +24,8 @@ #define log_link_full_errno(link, level, error, ...) \ ({ \ const Link *_l = (link); \ - (_l && _l->ifname) ? log_object_internal(level, error, PROJECT_FILE, __LINE__, __func__, "INTERFACE=", _l->ifname, NULL, NULL, ##__VA_ARGS__) : \ - log_internal(level, error, PROJECT_FILE, __LINE__, __func__, ##__VA_ARGS__); \ - }) \ + log_interface_full_errno(_l ? _l->ifname : NULL, level, error, ##__VA_ARGS__); \ + }) #define log_link_full(link, level, ...) (void) log_link_full_errno(link, level, 0, __VA_ARGS__)