X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudev-event.c;h=67fb1f78f5af880e58226f67027ed282f96c5e09;hb=b94da8cf72aa363582e0acae134d45c88d13bc75;hp=e5a5175df9181bf3a9ade020b9e3df7cf84b6c7f;hpb=3738cc858d6d1312f66a31d2f7652328bb317876;p=elogind.git diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index e5a5175df..67fb1f78f 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -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 */ @@ -824,13 +824,11 @@ void udev_event_execute_rules(struct udev_event *event, for ((entry = udev_device_get_properties_list_entry(event->dev_db)); entry; entry = udev_list_entry_get_next(entry)) { const char *key, *value; - struct udev_list_entry *property; key = udev_list_entry_get_name(entry); value = udev_list_entry_get_value(entry); - property = udev_device_add_property(dev, key, value); - udev_list_entry_set_num(property, true); + udev_device_add_property(dev, key, value); } }