sd-device: enumerator - match only on initialized devices by default

It is still possible to include uninitialized ones, but now that is opt-in. In most
cases people only want initialized devices. Exception is if you want to work without
udev running.

Suggested by David Herrmann.

diff --git a/src/libsystemd/sd-device/device-enumerator-private.h b/src/libsystemd/sd-device/device-enumerator-private.h
index 4bcb13dbaf087fed2f2b5a6a073d4818eab4e569..543aed4ff52fd2fd1668beb35e23d8d3b1d26c62 100644 (file)
--- a/src/libsystemd/sd-device/device-enumerator-private.h
+++ b/src/libsystemd/sd-device/device-enumerator-private.h
@@ -27,6 +27,7 @@
 int device_enumerator_scan_devices(sd_device_enumerator *enumeartor);
 int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor);
 int device_enumerator_add_device(sd_device_enumerator *enumerator, sd_device *device);
 int device_enumerator_scan_devices(sd_device_enumerator *enumeartor);
 int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor);
 int device_enumerator_add_device(sd_device_enumerator *enumerator, sd_device *device);

+int device_enumerator_add_match_is_initialized(sd_device_enumerator *enumerator);

 sd_device *device_enumerator_get_first(sd_device_enumerator *enumerator);
 sd_device *device_enumerator_get_next(sd_device_enumerator *enumerator);
 
 sd_device *device_enumerator_get_first(sd_device_enumerator *enumerator);
 sd_device *device_enumerator_get_next(sd_device_enumerator *enumerator);
 

diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index eb637f5a572457a0b9dc202f307475c6f7206fe3..49c44bc47b55c444e30c5beb28360fd9f866ea2a 100644 (file)
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -52,7 +52,7 @@ struct sd_device_enumerator {
         Set *match_sysname;
         Set *match_tag;
         sd_device *match_parent;
         Set *match_sysname;
         Set *match_tag;
         sd_device *match_parent;

-        bool match_is_initialized;
+        bool match_allow_uninitialized;

 };
 
 _public_ int sd_device_enumerator_new(sd_device_enumerator **ret) {
 };
 
 _public_ int sd_device_enumerator_new(sd_device_enumerator **ret) {


@@ -250,10 +250,20 @@ _public_ int sd_device_enumerator_add_match_parent(sd_device_enumerator *enumera
         return 0;
 }
 
         return 0;
 }
 

-_public_ int sd_device_enumerator_add_match_is_initialized(sd_device_enumerator *enumerator) {
+_public_ int sd_device_enumerator_allow_uninitialized(sd_device_enumerator *enumerator) {

         assert_return(enumerator, -EINVAL);
 
         assert_return(enumerator, -EINVAL);
 

-        enumerator->match_is_initialized = true;
+        enumerator->match_allow_uninitialized = true;
+
+        enumerator->scan_uptodate = false;
+
+        return 0;
+}
+
+int device_enumerator_add_match_is_initialized(sd_device_enumerator *enumerator) {
+        assert_return(enumerator, -EINVAL);
+
+        enumerator->match_allow_uninitialized = false;

 
         enumerator->scan_uptodate = false;
 
 
         enumerator->scan_uptodate = false;
 


@@ -527,7 +537,7 @@ static int enumerator_scan_dir_and_add_devices(sd_device_enumerator *enumerator,
                  * might not store a database, and have no way to find out
                  * for all other types of devices.
                  */
                  * might not store a database, and have no way to find out
                  * for all other types of devices.
                  */

-                if (enumerator->match_is_initialized &&
+                if (!enumerator->match_allow_uninitialized &&

                     !initialized &&
                     (major(devnum) > 0 || ifindex > 0))
                         continue;
                     !initialized &&
                     (major(devnum) > 0 || ifindex > 0))
                         continue;

diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h
index 86f767054c070a3a18e09a17751e462d020a7ca4..38cb2a1102800d58dcf458cd91b97a90b833b428 100644 (file)
--- a/src/systemd/sd-device.h
+++ b/src/systemd/sd-device.h
@@ -92,7 +92,7 @@ int sd_device_enumerator_add_match_property(sd_device_enumerator *enumerator, co
 int sd_device_enumerator_add_match_sysname(sd_device_enumerator *enumerator, const char *sysname);
 int sd_device_enumerator_add_match_tag(sd_device_enumerator *enumerator, const char *tag);
 int sd_device_enumerator_add_match_parent(sd_device_enumerator *enumerator, sd_device *parent);
 int sd_device_enumerator_add_match_sysname(sd_device_enumerator *enumerator, const char *sysname);
 int sd_device_enumerator_add_match_tag(sd_device_enumerator *enumerator, const char *tag);
 int sd_device_enumerator_add_match_parent(sd_device_enumerator *enumerator, sd_device *parent);

-int sd_device_enumerator_add_match_is_initialized(sd_device_enumerator *enumerator);
+int sd_device_enumerator_allow_uninitialized(sd_device_enumerator *enumerator);

 
 _SD_END_DECLARATIONS;
 
 
 _SD_END_DECLARATIONS;