diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-09-09 16:28:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 16:28:51 +0200 |
| commit | 244d9793eee243923426204729566f0058739507 (patch) | |
| tree | 228f21e99d4b669f801ded790a2ff2866b40a34a /src/libsystemd/sd-device | |
| parent | Merge pull request #16982 from yuwata/socket-buffer-size (diff) | |
| parent | network: make log_link_error() or friends return void (diff) | |
| download | systemd-244d9793eee243923426204729566f0058739507.tar.xz systemd-244d9793eee243923426204729566f0058739507.zip | |
Merge pull request #16984 from yuwata/make-log_xxx_error-void
Make log_xxx_error() or friends return void
Diffstat (limited to 'src/libsystemd/sd-device')
| -rw-r--r-- | src/libsystemd/sd-device/device-util.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h index eda0f2f49e..032d1dc8b8 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/sd-device/device-util.h @@ -36,7 +36,7 @@ device; \ device = sd_device_enumerator_get_subsystem_next(enumerator)) -#define log_device_full(device, level, error, ...) \ +#define log_device_full_errno(device, level, error, ...) \ ({ \ const char *_sysname = NULL; \ sd_device *_d = (device); \ @@ -46,17 +46,19 @@ (void) sd_device_get_sysname(_d, &_sysname); \ log_object_internal(_level, _error, PROJECT_FILE, __LINE__, __func__, \ _sysname ? "DEVICE=" : NULL, _sysname, \ - NULL, NULL, ##__VA_ARGS__); \ + NULL, NULL, __VA_ARGS__); \ }) -#define log_device_debug(device, ...) log_device_full(device, LOG_DEBUG, 0, ##__VA_ARGS__) -#define log_device_info(device, ...) log_device_full(device, LOG_INFO, 0, ##__VA_ARGS__) -#define log_device_notice(device, ...) log_device_full(device, LOG_NOTICE, 0, ##__VA_ARGS__) -#define log_device_warning(device, ...) log_device_full(device, LOG_WARNING, 0, ##__VA_ARGS__) -#define log_device_error(device, ...) log_device_full(device, LOG_ERR, 0, ##__VA_ARGS__) - -#define log_device_debug_errno(device, error, ...) log_device_full(device, LOG_DEBUG, error, ##__VA_ARGS__) -#define log_device_info_errno(device, error, ...) log_device_full(device, LOG_INFO, error, ##__VA_ARGS__) -#define log_device_notice_errno(device, error, ...) log_device_full(device, LOG_NOTICE, error, ##__VA_ARGS__) -#define log_device_warning_errno(device, error, ...) log_device_full(device, LOG_WARNING, error, ##__VA_ARGS__) -#define log_device_error_errno(device, error, ...) log_device_full(device, LOG_ERR, error, ##__VA_ARGS__) +#define log_device_full(device, level, ...) (void) log_device_full_errno(device, level, 0, __VA_ARGS__) + +#define log_device_debug(device, ...) log_device_full_errno(device, LOG_DEBUG, 0, __VA_ARGS__) +#define log_device_info(device, ...) log_device_full(device, LOG_INFO, __VA_ARGS__) +#define log_device_notice(device, ...) log_device_full(device, LOG_NOTICE, __VA_ARGS__) +#define log_device_warning(device, ...) log_device_full(device, LOG_WARNING, __VA_ARGS__) +#define log_device_error(device, ...) log_device_full(device, LOG_ERR, __VA_ARGS__) + +#define log_device_debug_errno(device, error, ...) log_device_full_errno(device, LOG_DEBUG, error, __VA_ARGS__) +#define log_device_info_errno(device, error, ...) log_device_full_errno(device, LOG_INFO, error, __VA_ARGS__) +#define log_device_notice_errno(device, error, ...) log_device_full_errno(device, LOG_NOTICE, error, __VA_ARGS__) +#define log_device_warning_errno(device, error, ...) log_device_full_errno(device, LOG_WARNING, error, __VA_ARGS__) +#define log_device_error_errno(device, error, ...) log_device_full_errno(device, LOG_ERR, error, __VA_ARGS__) |