diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-04-14 05:54:17 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-15 19:32:55 +0200 |
| commit | 645c85022ac6c035ccdd0590db687c5be1147e85 (patch) | |
| tree | 51396f5c4ded9983b36d85980cb1d5fba59d1256 | |
| parent | bed66a8d19566adf94386482fe5ee0216b66f848 (diff) | |
| download | systemd-645c85022ac6c035ccdd0590db687c5be1147e85.tar.gz | |
sd-device: improve log message and tweak style
We shouldn't say the attribute is missing right after ruling out ENOENT.
(cherry picked from commit aca591ac55e5ee364905aec975388c5e30d0476c)
(cherry picked from commit e31914aa17df889ae10f0964a8bbc8c00e0f045b)
| -rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 64c83d2a84..4c8acef4d7 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -177,13 +177,12 @@ int device_set_syspath(sd_device *device, const char *_syspath, bool verify) { /* all 'devices' require an 'uevent' file */ path = strjoina(syspath, "/uevent"); - r = access(path, F_OK); - if (r < 0) { + if (access(path, F_OK) < 0) { if (errno == ENOENT) /* this is not a valid device */ return -ENODEV; - return log_debug_errno(errno, "sd-device: %s does not have an uevent file: %m", syspath); + return log_debug_errno(errno, "sd-device: cannot access uevent file for %s: %m", syspath); } } else { /* everything else just needs to be a directory */ |