libudev: device_new() -> udev_device_new()

diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index ea54badde41a2a7db06734f3bd41f3ba5b1150c1..96cc2dba1c653808dd706055bf8576bfc3ff0031 100644 (file)
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -222,7 +222,7 @@ void udev_device_set_info_loaded(struct udev_device *device)
        device->info_loaded = 1;
 }
 
        device->info_loaded = 1;
 }
 

-struct udev_device *device_new(struct udev *udev)
+struct udev_device *udev_device_new(struct udev *udev)

 {
        struct udev_device *udev_device;
        struct udev_list_entry *list_entry;
 {
        struct udev_device *udev_device;
        struct udev_list_entry *list_entry;


@@ -331,7 +331,7 @@ struct udev_device *udev_device_new_from_syspath(struct udev *udev, const char *
                }
        }
 
                }
        }
 

-       udev_device = device_new(udev);
+       udev_device = udev_device_new(udev);

        if (udev_device == NULL)
                return NULL;
 
        if (udev_device == NULL)
                return NULL;
 

diff --git a/libudev/libudev-monitor.c b/libudev/libudev-monitor.c
index 7a0cb478526baaf625e4a89ad531c81bce725940..5c4e8ca04ab6159710e70119c8c86490be1779bd 100644 (file)
--- a/libudev/libudev-monitor.c
+++ b/libudev/libudev-monitor.c
@@ -562,7 +562,7 @@ retry:
                }
        }
 
                }
        }
 

-       udev_device = device_new(udev_monitor->udev);
+       udev_device = udev_device_new(udev_monitor->udev);

        if (udev_device == NULL) {
                return NULL;
        }
        if (udev_device == NULL) {
                return NULL;
        }

diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index 5512341e9e5e9ec399c08c514a5b68d3e73ad742..f1ff10b7f48175688816b98537608c683da9bed8 100644 (file)
--- a/libudev/libudev-private.h
+++ b/libudev/libudev-private.h
@@ -39,13 +39,13 @@ void udev_log(struct udev *udev,
              int priority, const char *file, int line, const char *fn,
              const char *format, ...)
              __attribute__ ((format(printf, 6, 7)));
              int priority, const char *file, int line, const char *fn,
              const char *format, ...)
              __attribute__ ((format(printf, 6, 7)));

-struct udev_device *device_new(struct udev *udev);

 const char *udev_get_rules_path(struct udev *udev);
 int udev_get_run(struct udev *udev);
 struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value);
 struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev);
 
 /* libudev-device */
 const char *udev_get_rules_path(struct udev *udev);
 int udev_get_run(struct udev *udev);
 struct udev_list_entry *udev_add_property(struct udev *udev, const char *key, const char *value);
 struct udev_list_entry *udev_get_properties_list_entry(struct udev *udev);
 
 /* libudev-device */

+struct udev_device *udev_device_new(struct udev *udev);

 int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath);
 int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
 int udev_device_set_devtype(struct udev_device *udev_device, const char *devtype);
 int udev_device_set_syspath(struct udev_device *udev_device, const char *syspath);
 int udev_device_set_subsystem(struct udev_device *udev_device, const char *subsystem);
 int udev_device_set_devtype(struct udev_device *udev_device, const char *devtype);