]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udevadm-wait: shorten code a bit 24520/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 2 Sep 2022 17:09:06 +0000 (02:09 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 5 Sep 2022 21:09:55 +0000 (06:09 +0900)
src/udev/udevadm-wait.c

index 53fdacb867d89b1a8a0086cb8a2640fe233407f3..544c94616d590a0d005e99bbbb804689415beaee 100644 (file)
@@ -166,16 +166,9 @@ static int device_monitor_handler(sd_device_monitor *monitor, sd_device *device,
         if (path_strv_contains(arg_devices, name))
                 return check_and_exit(sd_device_monitor_get_event(monitor));
 
-        STRV_FOREACH(p, arg_devices) {
-                const char *link;
-
-                if (!path_startswith(*p, "/dev"))
-                        continue;
-
-                FOREACH_DEVICE_DEVLINK(device, link)
-                        if (path_equal(*p, link))
-                                return check_and_exit(sd_device_monitor_get_event(monitor));
-        }
+        FOREACH_DEVICE_DEVLINK(device, name)
+                if (path_strv_contains(arg_devices, name))
+                        return check_and_exit(sd_device_monitor_get_event(monitor));
 
         return 0;
 }