libudev: udev_device_get_devname -> udev_device_get_devnode

diff --git a/udev/lib/exported_symbols b/udev/lib/exported_symbols
index c06148b25403398f802fc16933a432e601c873b9..5646bb59fa5a2b34d596f55e3bc2b8756144036c 100644 (file)
--- 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 cc44c78ad79c3b91426915a4c40ec2accb97e38c..731230efd0143858bd9da1072d60696fdbd6fd46 100644 (file)
--- 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 78fc137c1205dedca0c6895f5ef0567ad06f1e49..1970652f8fbfe0fa5d95e813e79d6eb1b180595e 100644 (file)
--- 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 39330a74c6cbbe036370008b01db80ec598556c3..0a0d754b38e34441453256efeb5f6e8d7271e730 100644 (file)
--- 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 3cd889fe00602a8ac2e6c51dfa7f35b3d89058cc..dbcaaffcdb473b99c835ba37dee21a5f7d0cd8c6 100644 (file)
--- 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: