diff options
| -rw-r--r-- | src/libsystemd/sd-device/device-enumerator-private.h | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-device/device-enumerator.c | 8 | ||||
| -rw-r--r-- | src/libudev/libudev-enumerate.c | 2 | ||||
| -rw-r--r-- | src/systemd/sd-device.h | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/libsystemd/sd-device/device-enumerator-private.h b/src/libsystemd/sd-device/device-enumerator-private.h index 515a60da22..4d0a2d3c79 100644 --- a/src/libsystemd/sd-device/device-enumerator-private.h +++ b/src/libsystemd/sd-device/device-enumerator-private.h @@ -25,6 +25,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); 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 37d46e57cf..eb637f5a57 100644 --- a/src/libsystemd/sd-device/device-enumerator.c +++ b/src/libsystemd/sd-device/device-enumerator.c @@ -317,7 +317,7 @@ static int device_compare(const void *_a, const void *_b) { return strcmp(devpath_a, devpath_b); } -_public_ int sd_device_enumerator_add_device(sd_device_enumerator *enumerator, sd_device *device) { +int device_enumerator_add_device(sd_device_enumerator *enumerator, sd_device *device) { int r; assert_return(enumerator, -EINVAL); @@ -544,7 +544,7 @@ static int enumerator_scan_dir_and_add_devices(sd_device_enumerator *enumerator, if (!match_sysattr(enumerator, device)) continue; - k = sd_device_enumerator_add_device(enumerator, device); + k = device_enumerator_add_device(enumerator, device); if (k < 0) r = k; } @@ -670,7 +670,7 @@ static int enumerator_scan_devices_tag(sd_device_enumerator *enumerator, const c if (!match_sysattr(enumerator, device)) continue; - k = sd_device_enumerator_add_device(enumerator, device); + k = device_enumerator_add_device(enumerator, device); if (k < 0) { r = k; continue; @@ -727,7 +727,7 @@ static int parent_add_child(sd_device_enumerator *enumerator, const char *path) if (!match_sysattr(enumerator, device)) return 0; - r = sd_device_enumerator_add_device(enumerator, device); + r = device_enumerator_add_device(enumerator, device); if (r < 0) return r; diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c index 290c3dae42..1498697d7b 100644 --- a/src/libudev/libudev-enumerate.c +++ b/src/libudev/libudev-enumerate.c @@ -351,7 +351,7 @@ _public_ int udev_enumerate_add_syspath(struct udev_enumerate *udev_enumerate, c if (r < 0) return r; - r = sd_device_enumerator_add_device(udev_enumerate->enumerator, device); + r = device_enumerator_add_device(udev_enumerate->enumerator, device); if (r < 0) return r; diff --git a/src/systemd/sd-device.h b/src/systemd/sd-device.h index 5fcd35f1d5..86f767054c 100644 --- a/src/systemd/sd-device.h +++ b/src/systemd/sd-device.h @@ -81,8 +81,6 @@ int sd_device_enumerator_new(sd_device_enumerator **ret); sd_device_enumerator *sd_device_enumerator_ref(sd_device_enumerator *enumerator); sd_device_enumerator *sd_device_enumerator_unref(sd_device_enumerator *enumerator); -int sd_device_enumerator_add_device(sd_device_enumerator *enumerator, sd_device *device); - sd_device *sd_device_enumerator_get_device_first(sd_device_enumerator *enumerator); sd_device *sd_device_enumerator_get_device_next(sd_device_enumerator *enumerator); sd_device *sd_device_enumerator_get_subsystem_first(sd_device_enumerator *enumerator); |