summaryrefslogtreecommitdiff
path: root/src/shared/udev-util.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-09-23 12:02:48 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-09-24 16:36:43 +0200
commitfe79f107efc497b4e7a6b40e5b8a04a490b88d78 (patch)
tree50e9caff433727e0896484c1793fa6acc5fbcfcb /src/shared/udev-util.c
parent960b585ba116cc09055d3f5540a0c73e088d37e4 (diff)
downloadsystemd-fe79f107efc497b4e7a6b40e5b8a04a490b88d78.tar.gz
tree-wide: drop assignments to r when we only need errno
If the whole call is simple and we don't need to look at the return value apart from the conditional, let's use a form without assignment of the return value. When the function call is more complicated, it still makes sense to use a temporary variable.
Diffstat (limited to 'src/shared/udev-util.c')
-rw-r--r--src/shared/udev-util.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 8b27a6d0d0..3aac21217a 100644
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -118,12 +118,13 @@ static int device_new_from_dev_path(const char *devlink, sd_device **ret_device)
assert(devlink);
- r = stat(devlink, &st);
- if (r < 0)
- return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, "Failed to stat() %s: %m", devlink);
+ if (stat(devlink, &st) < 0)
+ return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno,
+ "Failed to stat() %s: %m", devlink);
if (!S_ISBLK(st.st_mode))
- return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK), "%s does not point to a block device: %m", devlink);
+ return log_error_errno(SYNTHETIC_ERRNO(ENOTBLK),
+ "%s does not point to a block device: %m", devlink);
r = sd_device_new_from_devnum(ret_device, 'b', st.st_rdev);
if (r < 0)