diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-09-09 02:10:27 +0900 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-11 20:05:02 +0200 |
commit | 07671aa4cc8f0211e77b8227e89d5b73ad7121c0 (patch) | |
tree | 986024c03d72446e3c795a923b13a1a7749108c4 | |
parent | d4bea73972fb7443b3c02261e2c9c174f0ff92f8 (diff) | |
download | systemd-07671aa4cc8f0211e77b8227e89d5b73ad7121c0.tar.gz |
sd-device: make log_device_error() or friends return void
(cherry picked from commit ab54f12b783eea891d6414fbc14cd6fe7cbe4c80)
-rw-r--r-- | src/libsystemd/sd-device/device-util.h | 28 | ||||
-rw-r--r-- | src/udev/udev-builtin-uaccess.c | 4 | ||||
-rw-r--r-- | src/udev/udev-event.c | 2 | ||||
-rw-r--r-- | src/udev/udev-node.c | 22 | ||||
-rw-r--r-- | src/udev/udev-rules.c | 6 | ||||
-rw-r--r-- | src/udev/udev-watch.c | 6 |
6 files changed, 34 insertions, 34 deletions
diff --git a/src/libsystemd/sd-device/device-util.h b/src/libsystemd/sd-device/device-util.h index 1a1795d974..431d4a1b43 100644 --- a/src/libsystemd/sd-device/device-util.h +++ b/src/libsystemd/sd-device/device-util.h @@ -31,7 +31,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); \ @@ -41,17 +41,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__) diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c index 63401a570e..d552316eee 100644 --- a/src/udev/udev-builtin-uaccess.c +++ b/src/udev/udev-builtin-uaccess.c @@ -50,7 +50,7 @@ static int builtin_uaccess(sd_device *dev, int argc, char *argv[], bool test) { r = devnode_acl(path, true, false, 0, true, uid); if (r < 0) { - log_device_full(dev, r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, "Failed to apply ACL: %m"); + log_device_full_errno(dev, r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, "Failed to apply ACL: %m"); goto finish; } @@ -64,7 +64,7 @@ finish: /* Better be safe than sorry and reset ACL */ k = devnode_acl(path, true, false, 0, false, 0); if (k < 0) { - log_device_full(dev, k == -ENOENT ? LOG_DEBUG : LOG_ERR, k, "Failed to apply ACL: %m"); + log_device_full_errno(dev, k == -ENOENT ? LOG_DEBUG : LOG_ERR, k, "Failed to apply ACL: %m"); if (r >= 0) r = k; } diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index e1c2baf7f2..f276964305 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -633,7 +633,7 @@ static int on_spawn_sigchld(sd_event_source *s, const siginfo_t *si, void *userd if (si->si_status == 0) log_device_debug(spawn->device, "Process '%s' succeeded.", spawn->cmd); else - log_device_full(spawn->device, spawn->accept_failure ? LOG_DEBUG : LOG_WARNING, 0, + log_device_full(spawn->device, spawn->accept_failure ? LOG_DEBUG : LOG_WARNING, "Process '%s' failed with exit code %i.", spawn->cmd, si->si_status); ret = si->si_status; break; diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 31a3403093..643d413ba5 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -325,13 +325,13 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac, r = chmod_and_chown(devnode, mode, uid, gid); if (r < 0) - log_device_full(dev, r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, - "Failed to set owner/mode of %s to uid=" UID_FMT - ", gid=" GID_FMT ", mode=%#o: %m", - devnode, - uid_is_valid(uid) ? uid : stats.st_uid, - gid_is_valid(gid) ? gid : stats.st_gid, - mode != MODE_INVALID ? mode & 0777 : stats.st_mode & 0777); + log_device_full_errno(dev, r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, + "Failed to set owner/mode of %s to uid=" UID_FMT + ", gid=" GID_FMT ", mode=%#o: %m", + devnode, + uid_is_valid(uid) ? uid : stats.st_uid, + gid_is_valid(gid) ? gid : stats.st_gid, + mode != MODE_INVALID ? mode & 0777 : stats.st_mode & 0777); } else log_device_debug(dev, "Preserve permissions of %s, uid=" UID_FMT ", gid=" GID_FMT ", mode=%#o", devnode, @@ -348,8 +348,8 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac, q = mac_selinux_apply(devnode, label); if (q < 0) - log_device_full(dev, q == -ENOENT ? LOG_DEBUG : LOG_ERR, q, - "SECLABEL: failed to set SELinux label '%s': %m", label); + log_device_full_errno(dev, q == -ENOENT ? LOG_DEBUG : LOG_ERR, q, + "SECLABEL: failed to set SELinux label '%s': %m", label); else log_device_debug(dev, "SECLABEL: set SELinux label '%s'", label); @@ -358,8 +358,8 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac, q = mac_smack_apply(devnode, SMACK_ATTR_ACCESS, label); if (q < 0) - log_device_full(dev, q == -ENOENT ? LOG_DEBUG : LOG_ERR, q, - "SECLABEL: failed to set SMACK label '%s': %m", label); + log_device_full_errno(dev, q == -ENOENT ? LOG_DEBUG : LOG_ERR, q, + "SECLABEL: failed to set SMACK label '%s': %m", label); else log_device_debug(dev, "SECLABEL: set SMACK label '%s'", label); diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index f38fa6b8ad..9d6dc42448 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -189,9 +189,9 @@ struct UdevRules { UdevRuleLine *_l = _f ? _f->current_line : NULL; \ const char *_n = _f ? _f->filename : NULL; \ \ - log_device_full(device, level, error, "%s:%u " fmt, \ - strna(_n), _l ? _l->line_number : 0, \ - ##__VA_ARGS__); \ + log_device_full_errno(device, level, error, "%s:%u " fmt, \ + strna(_n), _l ? _l->line_number : 0, \ + ##__VA_ARGS__); \ }) #define log_rule_full(device, rules, level, ...) (void) log_rule_full_errno(device, rules, level, 0, __VA_ARGS__) diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c index 96a25ddf7c..d87a43537c 100644 --- a/src/udev/udev-watch.c +++ b/src/udev/udev-watch.c @@ -97,10 +97,8 @@ int udev_watch_begin(sd_device *dev) { log_device_debug(dev, "Adding watch on '%s'", devnode); wd = inotify_add_watch(inotify_fd, devnode, IN_CLOSE_WRITE); if (wd < 0) - return log_device_full(dev, - errno == ENOENT ? LOG_DEBUG : LOG_ERR, - errno, - "Failed to add device '%s' to watch: %m", devnode); + return log_device_full_errno(dev, errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, + "Failed to add device '%s' to watch: %m", devnode); device_set_watch_handle(dev, wd); |