sd-device: enumerator - don't expose add_device()

This is rarely, if ever, used. Drop it from the new public API and only keep it for
the legacy API.

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 b4c15326afda84a2bcd15e941eda5cd0598cbb10..4bcb13dbaf087fed2f2b5a6a073d4818eab4e569 100644 (file)
--- a/src/libsystemd/sd-device/device-enumerator-private.h
+++ b/src/libsystemd/sd-device/device-enumerator-private.h
@@ -26,6 +26,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 37d46e57cf07d24a33b3a9b6c8ca299649b4b4c8..eb637f5a572457a0b9dc202f307475c6f7206fe3 100644 (file)
--- 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/systemd/sd-device.h b/src/systemd/sd-device.h
index 5fcd35f1d599f310f4a6ccf02a8f45ee151c1f20..86f767054c070a3a18e09a17751e462d020a7ca4 100644 (file)
--- 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);