diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-09-09 02:33:03 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-20 11:50:48 +0200 |
| commit | 3ac33a97fa5854e117c9ec14759f888c4ae3c08d (patch) | |
| tree | c614d45c17521baf16cc87657b4464dc729a00b9 | |
| parent | ab329f06a0f62310e1afbba89b038dc9c92b7885 (diff) | |
| download | systemd-3ac33a97fa5854e117c9ec14759f888c4ae3c08d.tar.gz | |
network: make log_link_error() or friends return void
(cherry picked from commit d157714b6819d9e4faa93ef64a5041d5a8ae4779)
(cherry picked from commit f0e6d9876d7931936eaa832a0fd0b11ee516d750)
| -rw-r--r-- | src/network/networkd-link.c | 12 | ||||
| -rw-r--r-- | src/shared/log-link.h | 24 |
2 files changed, 19 insertions, 17 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index bc7bf2595c..d7c1317695 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -4304,10 +4304,10 @@ int log_link_message_full_errno(Link *link, sd_netlink_message *m, int level, in const char *err_msg = NULL; (void) sd_netlink_message_read_string(m, NLMSGERR_ATTR_MSG, &err_msg); - return log_link_full(link, level, err, - "%s: %s%s%s%m", - msg, - strempty(err_msg), - err_msg && !endswith(err_msg, ".") ? "." : "", - err_msg ? " " : ""); + return log_link_full_errno(link, level, err, + "%s: %s%s%s%m", + msg, + strempty(err_msg), + err_msg && !endswith(err_msg, ".") ? "." : "", + err_msg ? " " : ""); } diff --git a/src/shared/log-link.h b/src/shared/log-link.h index 2d03802690..b844f9ef81 100644 --- a/src/shared/log-link.h +++ b/src/shared/log-link.h @@ -14,24 +14,26 @@ * See, network/networkd-link.h for example. */ -#define log_link_full(link, level, error, ...) \ +#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__); \ }) \ -#define log_link_debug(link, ...) log_link_full(link, LOG_DEBUG, 0, ##__VA_ARGS__) -#define log_link_info(link, ...) log_link_full(link, LOG_INFO, 0, ##__VA_ARGS__) -#define log_link_notice(link, ...) log_link_full(link, LOG_NOTICE, 0, ##__VA_ARGS__) -#define log_link_warning(link, ...) log_link_full(link, LOG_WARNING, 0, ##__VA_ARGS__) -#define log_link_error(link, ...) log_link_full(link, LOG_ERR, 0, ##__VA_ARGS__) +#define log_link_full(link, level, ...) (void) log_link_full_errno(link, level, 0, __VA_ARGS__) -#define log_link_debug_errno(link, error, ...) log_link_full(link, LOG_DEBUG, error, ##__VA_ARGS__) -#define log_link_info_errno(link, error, ...) log_link_full(link, LOG_INFO, error, ##__VA_ARGS__) -#define log_link_notice_errno(link, error, ...) log_link_full(link, LOG_NOTICE, error, ##__VA_ARGS__) -#define log_link_warning_errno(link, error, ...) log_link_full(link, LOG_WARNING, error, ##__VA_ARGS__) -#define log_link_error_errno(link, error, ...) log_link_full(link, LOG_ERR, error, ##__VA_ARGS__) +#define log_link_debug(link, ...) log_link_full_errno(link, LOG_DEBUG, 0, __VA_ARGS__) +#define log_link_info(link, ...) log_link_full(link, LOG_INFO, __VA_ARGS__) +#define log_link_notice(link, ...) log_link_full(link, LOG_NOTICE, __VA_ARGS__) +#define log_link_warning(link, ...) log_link_full(link, LOG_WARNING, __VA_ARGS__) +#define log_link_error(link, ...) log_link_full(link, LOG_ERR, __VA_ARGS__) + +#define log_link_debug_errno(link, error, ...) log_link_full_errno(link, LOG_DEBUG, error, __VA_ARGS__) +#define log_link_info_errno(link, error, ...) log_link_full_errno(link, LOG_INFO, error, __VA_ARGS__) +#define log_link_notice_errno(link, error, ...) log_link_full_errno(link, LOG_NOTICE, error, __VA_ARGS__) +#define log_link_warning_errno(link, error, ...) log_link_full_errno(link, LOG_WARNING, error, __VA_ARGS__) +#define log_link_error_errno(link, error, ...) log_link_full_errno(link, LOG_ERR, error, __VA_ARGS__) #define LOG_LINK_MESSAGE(link, fmt, ...) "MESSAGE=%s: " fmt, (link)->ifname, ##__VA_ARGS__ #define LOG_LINK_INTERFACE(link) "INTERFACE=%s", (link)->ifname |