summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-06-09 13:11:23 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-06-09 13:11:23 +0200
commita5710160377a85e7c78601e2c45049b392891436 (patch)
tree1b3ca74e95492656decd77280cbf51daa573a80e
parent62f11eed3ee2bbcf5a204f63a2d2bc9d78eb01e1 (diff)
libudev: device_new() -> udev_device_new()
-rw-r--r--libudev/libudev-device.c4
-rw-r--r--libudev/libudev-monitor.c2
-rw-r--r--libudev/libudev-private.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index ea54badde4..96cc2dba1c 100644
--- 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;
}
-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;
@@ -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;
diff --git a/libudev/libudev-monitor.c b/libudev/libudev-monitor.c
index 7a0cb47852..5c4e8ca04a 100644
--- 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;
}
diff --git a/libudev/libudev-private.h b/libudev/libudev-private.h
index 5512341e9e..f1ff10b7f4 100644
--- 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)));
-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 */
+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);