From: Kay Sievers Date: Tue, 9 Sep 2008 20:10:33 +0000 (+0200) Subject: libudev: rename enumerate function X-Git-Tag: 174~1567 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=6b12bdb62460a0bdc08d5e020a64c18bc1672bb1 libudev: rename enumerate function --- diff --git a/udev/lib/exported_symbols b/udev/lib/exported_symbols index 72a293722..129cb9c36 100644 --- a/udev/lib/exported_symbols +++ b/udev/lib/exported_symbols @@ -21,7 +21,7 @@ udev_device_get_action udev_device_get_driver udev_device_get_devnum udev_device_get_seqnum -udev_devices_enumerate +udev_enumerate_devices udev_monitor_new_from_socket udev_monitor_new_from_netlink udev_monitor_enable_receiving diff --git a/udev/lib/libudev-enumerate.c b/udev/lib/libudev-enumerate.c index 6aa04d8f9..1ba4de894 100644 --- a/udev/lib/libudev-enumerate.c +++ b/udev/lib/libudev-enumerate.c @@ -130,7 +130,7 @@ static int devices_call(struct udev *udev, const char *devpath, } /** - * udev_devices_enumerate: + * udev_enumerate_devices: * @udev_device: udev device * @cb: function to be called for every property found * @data: data to be passed to the function @@ -142,7 +142,7 @@ static int devices_call(struct udev *udev, const char *devpath, * * Returns: the number of properties passed to the caller, or a negative value on error **/ -int udev_devices_enumerate(struct udev *udev, const char *subsystem, +int udev_enumerate_devices(struct udev *udev, const char *subsystem, int (*cb)(struct udev *udev, const char *devpath, const char *subsystem, const char *name, void *data), void *data) diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h index 2267c9ea9..2fd990f92 100644 --- a/udev/lib/libudev.h +++ b/udev/lib/libudev.h @@ -63,7 +63,7 @@ extern dev_t udev_device_get_devnum(struct udev_device *udev_device); extern const char *udev_device_get_action(struct udev_device *udev_device); extern unsigned long long int udev_device_get_seqnum(struct udev_device *udev_device); -extern int udev_devices_enumerate(struct udev *udev, const char *subsystem, +extern int udev_enumerate_devices(struct udev *udev, const char *subsystem, int (*cb)(struct udev *udev, const char *devpath, const char *subsystem, const char *name, void *data), void *data); diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c index 4fdef6888..1e9469d1c 100644 --- a/udev/lib/test-libudev.c +++ b/udev/lib/test-libudev.c @@ -98,7 +98,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem) { int count; - count = udev_devices_enumerate(udev, subsystem, devices_enum_cb, NULL); + count = udev_enumerate_devices(udev, subsystem, devices_enum_cb, NULL); printf("found %i devices\n\n", count); return count; }