]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev-node: shorten code a bit and update log message
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 1 Sep 2021 23:23:35 +0000 (08:23 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 2 Sep 2021 00:06:24 +0000 (09:06 +0900)
src/udev/udev-node.c

index 28e6e8df944695fd092f36a58b0c956bcf4ebc09..2e7df899e4e5b55304fca387d92e8f44c1f8633e 100644 (file)
@@ -447,13 +447,12 @@ static int link_update(sd_device *dev, const char *slink_in, bool add) {
                 _cleanup_free_ char *target = NULL;
                 struct stat st1 = {}, st2 = {};
 
-                r = stat(dirname, &st1);
-                if (r < 0 && errno != ENOENT)
+                if (stat(dirname, &st1) < 0 && errno != ENOENT)
                         return log_device_debug_errno(dev, errno, "Failed to stat %s: %m", dirname);
 
                 r = link_find_prioritized(dev, add, dirname, &target);
                 if (r < 0)
-                        return log_device_debug_errno(dev, r, "Failed to determine highest priority for symlink '%s': %m", slink);
+                        return log_device_debug_errno(dev, r, "Failed to determine device node with the highest priority for '%s': %m", slink);
                 if (r == 0) {
                         log_device_debug(dev, "No reference left for '%s', removing", slink);