From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 9 Jun 2009 11:11:23 +0000 (+0200)
Subject: libudev: device_new() -> udev_device_new()
X-Git-Tag: 174~994
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a5710160377a85e7c78601e2c45049b392891436;ds=sidebyside

libudev: device_new() -> udev_device_new()
---

diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index ea54badde..96cc2dba1 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 7a0cb4785..5c4e8ca04 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 5512341e9..f1ff10b7f 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);