X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.h;fp=src%2Fnetwork%2Fnetworkd-link.h;h=61cdbf31320ab65366ffc3302ce4a33bc369954c;hp=5eb4b889317473c324d8f3ff159da70c178c756b;hb=79008bddf679a5e0900369950eb346c9fa687107;hpb=e09ca588d25a0c383880d6c2f5b129296af781ab diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 5eb4b8893..61cdbf313 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -132,14 +132,14 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref); /* Macros which append INTERFACE= to the message */ -#define log_full_link(level, link, fmt, ...) log_meta_object(level, 0, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__) -#define log_debug_link(link, ...) log_full_link(LOG_DEBUG, link, ##__VA_ARGS__) -#define log_info_link(link, ...) log_full_link(LOG_INFO, link, ##__VA_ARGS__) -#define log_notice_link(link, ...) log_full_link(LOG_NOTICE, link, ##__VA_ARGS__) -#define log_warning_link(link, ...) log_full_link(LOG_WARNING, link, ##__VA_ARGS__) -#define log_error_link(link, ...) log_full_link(LOG_ERR, link, ##__VA_ARGS__) - -#define log_struct_link(level, link, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__) +#define log_link_full(level, link, fmt, ...) log_object_internal(level, 0, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__) +#define log_link_debug(link, ...) log_link_full(LOG_DEBUG, link, ##__VA_ARGS__) +#define log_link_info(link, ...) log_link_full(LOG_INFO, link, ##__VA_ARGS__) +#define log_link_notice(link, ...) log_link_full(LOG_NOTICE, link, ##__VA_ARGS__) +#define log_link_warning(link, ...) log_link_full(LOG_WARNING, link, ##__VA_ARGS__) +#define log_link_error(link, ...) log_link_full(LOG_ERR, link, ##__VA_ARGS__) + +#define log_link_struct(level, link, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__) #define ADDRESS_FMT_VAL(address) \ (address).s_addr & 0xFF, \