tree-wide: use device_is_processed() more

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 94e751cf65833ec4d313f81e0f6ce84053d4371d..e89f087aea68347efd9f2406dcbf7d3ce5f3a053 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -487,7 +487,7 @@ static int test_network_interface_initialized(const char *name) {
         if (r < 0)
                 return log_error_errno(r, "Failed to get device %s: %m", name);
 
         if (r < 0)
                 return log_error_errno(r, "Failed to get device %s: %m", name);
 

-        r = sd_device_get_is_initialized(d);
+        r = device_is_processed(d);

         if (r < 0)
                 return log_error_errno(r, "Failed to determine whether interface %s is initialized: %m", name);
         if (r == 0)
         if (r < 0)
                 return log_error_errno(r, "Failed to determine whether interface %s is initialized: %m", name);
         if (r == 0)

diff --git a/src/shared/udev-util.c b/src/shared/udev-util.c
index 19346940352d614bf1ba5617437f675eebe75501..15996ca7247428e035133f313b152c768125afe9 100644 (file)
--- a/src/shared/udev-util.c
+++ b/src/shared/udev-util.c
@@ -139,7 +139,7 @@ static int device_wait_for_initialization_internal(
         }
 
         if (device) {
         }
 
         if (device) {

-                if (sd_device_get_is_initialized(device) > 0) {
+                if (device_is_processed(device) > 0) {

                         if (ret)
                                 *ret = sd_device_ref(device);
                         return 0;
                         if (ret)
                                 *ret = sd_device_ref(device);
                         return 0;


@@ -202,7 +202,7 @@ static int device_wait_for_initialization_internal(
                 if (r < 0 && !ERRNO_IS_DEVICE_ABSENT(r))
                         return log_error_errno(r, "Failed to create sd-device object from %s: %m", devlink);
         }
                 if (r < 0 && !ERRNO_IS_DEVICE_ABSENT(r))
                         return log_error_errno(r, "Failed to create sd-device object from %s: %m", devlink);
         }

-        if (device && sd_device_get_is_initialized(device) > 0) {
+        if (device && device_is_processed(device) > 0) {

                 if (ret)
                         *ret = sd_device_ref(device);
                 return 0;
                 if (ret)
                         *ret = sd_device_ref(device);
                 return 0;

diff --git a/src/udev/udevadm-wait.c b/src/udev/udevadm-wait.c
index e6620c25dd1e571031434c8992f3e7c23c74541f..6ffc86bbf1efe91f3ccf5d5f73a7fb7071fca4ee 100644 (file)
--- a/src/udev/udevadm-wait.c
+++ b/src/udev/udevadm-wait.c
@@ -67,7 +67,7 @@ static int check_device(const char *path) {
                 return r;
 
         if (arg_wait_until == WAIT_UNTIL_INITIALIZED)
                 return r;
 
         if (arg_wait_until == WAIT_UNTIL_INITIALIZED)

-                return sd_device_get_is_initialized(dev);
+                return device_is_processed(dev);

 
         return true;
 }
 
         return true;
 }