picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Tom Gundersen 2015-04-17 13:50:10 +02:00
parent c32eb440ba
commit 19c9df4492
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libsystemd/sd-device/device-enumerator-private.h
View File

@ -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);

8
src/libsystemd/sd-device/device-enumerator.c
View File

@ -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;

2
src/libudev/libudev-enumerate.c
View File

@ -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;

2
src/systemd/sd-device.h
View File

@ -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);