From fb762bb928772f1923fef1e342d8ebca9bf7691f Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Sat, 20 Sep 2008 00:01:20 -0700
Subject: [PATCH] libudev: udev_device_get_devname -> udev_device_get_devnode

---
 udev/lib/exported_symbols | 2 +-
 udev/lib/libudev-device.c | 4 ++--
 udev/lib/libudev.h        | 2 +-
 udev/lib/test-libudev.c   | 2 +-
 udev/udevadm-info.c       | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/udev/lib/exported_symbols b/udev/lib/exported_symbols
index c06148b25..5646bb59f 100644
--- a/udev/lib/exported_symbols
+++ b/udev/lib/exported_symbols
@@ -14,7 +14,7 @@ udev_device_unref
 udev_device_get_udev
 udev_device_get_syspath
 udev_device_get_devpath
-udev_device_get_devname
+udev_device_get_devnode
 udev_device_get_sysname
 udev_device_get_subsystem
 udev_device_get_devlinks
diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index cc44c78ad..731230efd 100644
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -361,7 +361,7 @@ const char *udev_device_get_sysname(struct udev_device *udev_device)
 }
 
 /**
- * udev_device_get_devname:
+ * udev_device_get_devnode:
  * @udev_device: udev device
  *
  * Retrieve the device node file name belonging to the udev device.
@@ -369,7 +369,7 @@ const char *udev_device_get_sysname(struct udev_device *udev_device)
  *
  * Returns: the device node file name of the udev device, or #NULL if no device node exists
  **/
-const char *udev_device_get_devname(struct udev_device *udev_device)
+const char *udev_device_get_devnode(struct udev_device *udev_device)
 {
 	if (udev_device == NULL)
 		return NULL;
diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index 78fc137c1..1970652f8 100644
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -54,7 +54,7 @@ extern const char *udev_device_get_devpath(struct udev_device *udev_device);
 extern const char *udev_device_get_subsystem(struct udev_device *udev_device);
 extern const char *udev_device_get_syspath(struct udev_device *udev_device);
 extern const char *udev_device_get_sysname(struct udev_device *udev_device);
-extern const char *udev_device_get_devname(struct udev_device *udev_device);
+extern const char *udev_device_get_devnode(struct udev_device *udev_device);
 extern int udev_device_get_devlinks(struct udev_device *udev_device,
 				    int (*cb)(struct udev_device *udev_device,
 					      const char *value, void *data),
diff --git a/udev/lib/test-libudev.c b/udev/lib/test-libudev.c
index 39330a74c..0a0d754b3 100644
--- a/udev/lib/test-libudev.c
+++ b/udev/lib/test-libudev.c
@@ -64,7 +64,7 @@ static void print_device(struct udev_device *device)
 	printf("subsystem: '%s'\n", str);
 	str = udev_device_get_driver(device);
 	printf("driver:    '%s'\n", str);
-	str = udev_device_get_devname(device);
+	str = udev_device_get_devnode(device);
 	printf("devname:   '%s'\n", str);
 	count = udev_device_get_devlinks(device, print_devlinks_cb, NULL);
 	printf("found %i links\n", count);
diff --git a/udev/udevadm-info.c b/udev/udevadm-info.c
index 3cd889fe0..dbcaaffcd 100644
--- a/udev/udevadm-info.c
+++ b/udev/udevadm-info.c
@@ -148,7 +148,7 @@ static void print_record(struct udev_device *device)
 
 	printf("P: %s\n", udev_device_get_devpath(device));
 	len = strlen(udev_get_dev_path(udev_device_get_udev(device)));
-	printf("N: %s\n", &udev_device_get_devname(device)[len+1]);
+	printf("N: %s\n", &udev_device_get_devnode(device)[len+1]);
 	i = device_get_devlink_priority(device);
 	if (i != 0)
 		printf("L: %i\n", i);
@@ -165,7 +165,7 @@ static void print_record(struct udev_device *device)
 
 static int export_all_cb(struct udev_device *device, void *data)
 {
-	if (udev_device_get_devname(device) != NULL)
+	if (udev_device_get_devnode(device) != NULL)
 		print_record(device);
 	return 0;
 }
@@ -436,12 +436,12 @@ int udevadm_info(struct udev *udev, int argc, char *argv[])
 		switch(query) {
 		case QUERY_NAME:
 			if (root) {
-				printf("%s\n", udev_device_get_devname(device));
+				printf("%s\n", udev_device_get_devnode(device));
 			} else {
 				size_t len;
 
 				len = strlen(udev_get_dev_path(udev));
-				printf("%s\n", &udev_device_get_devname(device)[len+1]);
+				printf("%s\n", &udev_device_get_devnode(device)[len+1]);
 			}
 			break;
 		case QUERY_SYMLINK:
-- 
2.30.2