SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check that errno passed log_{interface,link}_*_errno() is non-zero

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2021-04-14 22:53:49 +02:00
parent e89f6ed476
commit f407219cd1
9 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/log-link.h
+18 -4
View File
@@ -3,13 +3,20 @@
#include "log.h"
#define log_interface_full_errno(ifname, level, error, ...) \
#define log_interface_full_errno_zerook(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__); \
})
#define log_interface_full_errno(ifname, level, error, ...) \
({ \
int _error = (error); \
ASSERT_NON_ZERO(_error); \
log_interface_full_errno_zerook(ifname, level, _error, __VA_ARGS__); \
})
/*
* The following macros append INTERFACE= to the message.
* The macros require a struct named 'Link' which contains 'char *ifname':
@@ -21,13 +28,20 @@
* See, network/networkd-link.h for example.
*/
#define log_link_full_errno(link, level, error, ...) \
#define log_link_full_errno_zerook(link, level, error, ...) \
({ \
const Link *_l = (link); \
log_interface_full_errno(_l ? _l->ifname : NULL, level, error, ##__VA_ARGS__); \
log_interface_full_errno_zerook(_l ? _l->ifname : NULL, level, error, __VA_ARGS__); \
})
#define log_link_full(link, level, ...) (void) log_link_full_errno(link, level, 0, __VA_ARGS__)
#define log_link_full_errno(link, level, error, ...) \
({ \
int _error = (error); \
ASSERT_NON_ZERO(_error); \
log_link_full_errno_zerook(link, level, _error, __VA_ARGS__); \
})
#define log_link_full(link, level, ...) (void) log_link_full_errno_zerook(link, level, 0, __VA_ARGS__)
#define log_link_debug(link, ...) log_link_full(link, LOG_DEBUG, __VA_ARGS__)
#define log_link_info(link, ...) log_link_full(link, LOG_INFO, __VA_ARGS__)