remove all PHYSDEVPATH handling and warning about

[elogind.git] / udev / lib / libudev-device.c

diff --git a/udev/lib/libudev-device.c b/udev/lib/libudev-device.c
index 92b2d18b83c994f482b7ef1b034437103057d479..ddc4b34115ac0848ba5db5a995ac94bcc8f16bcd 100644 (file)
--- a/udev/lib/libudev-device.c
+++ b/udev/lib/libudev-device.c
@@ -36,7 +36,7 @@ struct udev_device {
        char *driver;
        char *action;
        char *devpath_old;
-       char *physdevpath;
+       char *knodename;
        char **envp;
        char *monitor_buf;
        size_t monitor_buf_len;
@@ -208,6 +208,8 @@ int udev_device_read_uevent_file(struct udev_device *udev_device)
                        maj = strtoull(&line[6], NULL, 10);
                else if (strncmp(line, "MINOR=", 6) == 0)
                        min = strtoull(&line[6], NULL, 10);
+               else if (strncmp(line, "DEVNAME=", 8) == 0)
+                       udev_device_set_knodename(udev_device, &line[8]);
 
                udev_device_add_property_from_string(udev_device, line);
        }
@@ -621,7 +623,7 @@ void udev_device_unref(struct udev_device *udev_device)
        free(udev_device->action);
        free(udev_device->driver);
        free(udev_device->devpath_old);
-       free(udev_device->physdevpath);
+       free(udev_device->knodename);
        udev_list_cleanup_entries(udev_device->udev, &udev_device->sysattr_list);
        free(udev_device->envp);
        free(udev_device->monitor_buf);
@@ -1175,15 +1177,15 @@ int udev_device_set_devpath_old(struct udev_device *udev_device, const char *dev
        return 0;
 }
 
-const char *udev_device_get_physdevpath(struct udev_device *udev_device)
+const char *udev_device_get_knodename(struct udev_device *udev_device)
 {
-       return udev_device->physdevpath;
+       return udev_device->knodename;
 }
 
-int udev_device_set_physdevpath(struct udev_device *udev_device, const char *physdevpath)
+int udev_device_set_knodename(struct udev_device *udev_device, const char *knodename)
 {
-       udev_device->physdevpath = strdup(physdevpath);
-       if (udev_device->physdevpath == NULL)
+       udev_device->knodename = strdup(knodename);
+       if (udev_device->knodename == NULL)
                return -ENOMEM;
        return 0;
 }