tree-wide: replace device_enumerator_scan_devices()+FOREACH_DEVICE_AND_SUBSYSTEM...

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index c9d45c22531dd2ef21623e89c611b1ed9dcd59b8..5579d8a8bfcca9f291dbca3651b1caa998740fd7 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -4,7 +4,7 @@
 
 #include "alloc-util.h"
 #include "def.h"
-#include "device-enumerator-private.h"
+#include "device-util.h"
 #include "escape.h"
 #include "fileio.h"
 #include "mkdir.h"
@@ -156,11 +156,7 @@ static int validate_device(sd_device *device) {
         if (r < 0)
                 return r;
 
-        r = device_enumerator_scan_devices(enumerate);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(enumerate, other) {
+        FOREACH_DEVICE(enumerate, other) {
                 const char *other_subsystem;
                 sd_device *other_parent;
 

diff --git a/src/core/device.c b/src/core/device.c
index c8c8472ea4fb6b77890505393a4bf90bc1420d5c..634a45592f0cc2cc4b1f83ccdd021241fd6a3b8a 100644 (file)
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -7,7 +7,6 @@
 #include "bus-error.h"
 #include "dbus-device.h"
 #include "device-private.h"
-#include "device-enumerator-private.h"
 #include "device-util.h"
 #include "device.h"
 #include "libudev-private.h"
@@ -831,13 +830,7 @@ static void device_enumerate(Manager *m) {
                 goto fail;
         }
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0) {
-                log_error_errno(r, "Failed to enumerate devices: %m");
-                goto fail;
-        }
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, dev) {
+        FOREACH_DEVICE(e, dev) {
                 const char *sysfs;
 
                 if (!device_is_ready(dev))

diff --git a/src/core/umount.c b/src/core/umount.c
index f1779e201eb41df848c6d198e0faf80eae1f8dd1..3d4524a0e1e3fee1cf7eb96f6b09a9df16ba9564 100644 (file)
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -18,7 +18,7 @@
 #include "alloc-util.h"
 #include "blockdev-util.h"
 #include "def.h"
-#include "device-enumerator-private.h"
+#include "device-util.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fstab-util.h"
@@ -255,11 +255,7 @@ static int loopback_list_get(MountPoint **head) {
         if (r < 0)
                 return r;
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 _cleanup_free_ MountPoint *lb = NULL;
                 const char *dn;
 
@@ -304,11 +300,7 @@ static int dm_list_get(MountPoint **head) {
         if (r < 0)
                 return r;
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 _cleanup_free_ MountPoint *m = NULL;
                 const char *dn;
                 dev_t devnum;

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 94b33aef7d13dc4ccdc7c470dca22119a64bd749..da197d039c5eccd986c065bb6b940011fd68442f 100644 (file)
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -7,7 +7,7 @@
 
 #include "acl-util.h"
 #include "alloc-util.h"
-#include "device-enumerator-private.h"
+#include "device-util.h"
 #include "dirent-util.h"
 #include "escape.h"
 #include "fd-util.h"
@@ -193,11 +193,7 @@ int devnode_acl_all(const char *seat,
         if (r < 0)
                 return r;
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 const char *node, *sn;
 
                 if (sd_device_get_property_value(d, "ID_SEAT", &sn) < 0 || isempty(sn))

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index 5fc4f29127e2402ff5084bf751358fdd9786cb45..dac240d294f19d3ff7d5ee794de7071f5583d170 100644 (file)
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -13,7 +13,7 @@
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "conf-parser.h"
-#include "device-enumerator-private.h"
+#include "device-util.h"
 #include "fd-util.h"
 #include "logind.h"
 #include "parse-util.h"
@@ -571,11 +571,7 @@ static int manager_count_external_displays(Manager *m) {
         if (r < 0)
                 return r;
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 sd_device *p;
                 const char *status, *enabled, *dash, *nn, *i, *subsys;
                 bool external = false;

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 47cf62cb3d88f160e12575e6786ede245ce60ae9..5035bb5bdfed1c57960fa486a492060a05c6ad89 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -14,7 +14,7 @@
 #include "bus-error.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
-#include "device-enumerator-private.h"
+#include "device-util.h"
 #include "dirent-util.h"
 #include "efivars.h"
 #include "escape.h"
@@ -1210,11 +1210,7 @@ static int trigger_device(Manager *m, sd_device *d) {
                         return r;
         }
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 _cleanup_free_ char *t = NULL;
                 const char *p;
 

diff --git a/src/login/logind.c b/src/login/logind.c
index c487fbc6988469fda4a1258043846f262858e05b..b9ad1007ae99bbfb7c1c13afeacd9e73aa112c78 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -13,7 +13,7 @@
 #include "bus-util.h"
 #include "cgroup-util.h"
 #include "def.h"
-#include "device-enumerator-private.h"
+#include "device-util.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "format-util.h"
@@ -175,11 +175,7 @@ static int manager_enumerate_devices(Manager *m) {
         if (r < 0)
                 return r;
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 int k;
 
                 k = manager_process_seat_device(m, d);
@@ -214,11 +210,7 @@ static int manager_enumerate_buttons(Manager *m) {
         if (r < 0)
                 return r;
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 int k;
 
                 k = manager_process_button_device(m, d);

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 5ce9644861ffb1d14bdb5b6ab3eaae4d2e1af596..56ded606f518c3cb268c579f6345a9aeb9fe91be 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -5,10 +5,10 @@
 #include "sd-bus.h"
 #include "sd-device.h"
 
-#include "device-enumerator-private.h"
 #include "bus-error.h"
 #include "bus-unit-util.h"
 #include "bus-util.h"
+#include "device-util.h"
 #include "dirent-util.h"
 #include "escape.h"
 #include "fd-util.h"
@@ -1420,11 +1420,7 @@ static int list_devices(void) {
         if (r < 0)
                 return log_error_errno(r, "Failed to add property match: %m");
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return log_error_errno(r, "Failed to enumerate devices: %m");
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, d) {
+        FOREACH_DEVICE(e, d) {
                 struct item *j;
 
                 if (!GREEDY_REALLOC0(items, n_allocated, n+1)) {

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 5e48ee79813cdf69064a5f4ff72f2d8d255d240e..0429a55a9c80638e1f01f734c81fac8c25ebe907 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -14,8 +14,8 @@
 #include "copy.h"
 #include "crypt-util.h"
 #include "def.h"
-#include "device-enumerator-private.h"
 #include "device-nodes.h"
+#include "device-util.h"
 #include "dissect-image.h"
 #include "fd-util.h"
 #include "fileio.h"
@@ -278,13 +278,9 @@ int dissect_image(
                 if (r < 0)
                         return r;
 
-                r = device_enumerator_scan_devices(e);
-                if (r < 0)
-                        return r;
-
                 /* Count the partitions enumerated by the kernel */
                 n = 0;
-                FOREACH_DEVICE_AND_SUBSYSTEM(e, q) {
+                FOREACH_DEVICE(e, q) {
                         dev_t qn;
 
                         if (sd_device_get_devnum(q, &qn) < 0)
@@ -350,11 +346,7 @@ int dissect_image(
                 e = sd_device_enumerator_unref(e);
         }
 
-        r = device_enumerator_scan_devices(e);
-        if (r < 0)
-                return r;
-
-        FOREACH_DEVICE_AND_SUBSYSTEM(e, q) {
+        FOREACH_DEVICE(e, q) {
                 unsigned long long pflags;
                 blkid_partition pp;
                 const char *node;