chiark / gitweb /
libudev: udev_device_read_db - drop unused argument
[elogind.git] / src / udev / udev-event.c
index 1c5d5e9a49f0296d3778b9de16a84a84ac8f7096..7d0d98ca05bbf639fc80feb6786a29eb629ef67f 100644 (file)
@@ -793,7 +793,7 @@ void udev_event_execute_rules(struct udev_event *event,
                 return;
 
         if (streq(udev_device_get_action(dev), "remove")) {
-                udev_device_read_db(dev, NULL);
+                udev_device_read_db(dev);
                 udev_device_delete_db(dev);
                 udev_device_tag_index(dev, NULL, false);
 
@@ -810,7 +810,7 @@ void udev_event_execute_rules(struct udev_event *event,
         } else {
                 event->dev_db = udev_device_shallow_clone(dev);
                 if (event->dev_db != NULL) {
-                        udev_device_read_db(event->dev_db, NULL);
+                        udev_device_read_db(event->dev_db);
                         udev_device_set_info_loaded(event->dev_db);
 
                         /* disable watch during event processing */
@@ -849,20 +849,12 @@ void udev_event_execute_rules(struct udev_event *event,
                                 log_warning_errno(r, "could not rename interface '%d' from '%s' to '%s': %m", udev_device_get_ifindex(dev),
                                                   udev_device_get_sysname(dev), event->name);
                         else {
-                                const char *interface_old;
-
-                                /* remember old name */
-                                interface_old = udev_device_get_sysname(dev);
-
                                 r = udev_device_rename(dev, event->name);
                                 if (r < 0)
                                         log_warning_errno(r, "renamed interface '%d' from '%s' to '%s', but could not update udev_device: %m",
                                                           udev_device_get_ifindex(dev), udev_device_get_sysname(dev), event->name);
-                                else {
-                                        udev_device_add_property(dev, "INTERFACE_OLD", interface_old);
-                                        udev_device_add_property(dev, "INTERFACE", event->name);
+                                else
                                         log_debug("changed devpath to '%s'", udev_device_get_devpath(dev));
-                                }
                         }
                 }