libudev: rename enumerate function

diff --git a/udev/lib/exported_symbols b/udev/lib/exported_symbols
index 72a29372299c308dc347a6e473dcac122f7959f4..129cb9c36fb2e70eb1c53b47b8ddfc87b1ed5f88 100644 (file)
--- 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_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
 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 6aa04d8f9b4c1e547cf6f22334435413a21fbcca..1ba4de8948313a2e9aa3184e6565d97aaf9e4195 100644 (file)
--- 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
  * @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
  **/
  *
  * 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)
                           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 2267c9ea97d6e37be4a8062eb2ff72b9d88d26db..2fd990f92e1d23b32130071c579c6b1e69265536 100644 (file)
--- 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 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);
                                  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 4fdef68881211f609259b16e1b2dec51fc17c75e..1e9469d1c52b83388e7576a7de70745940dc85fc 100644 (file)
--- 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;
 
 {
        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;
 }
        printf("found %i devices\n\n", count);
        return count;
 }