From b94da8cf72aa363582e0acae134d45c88d13bc75 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 5 Mar 2015 18:08:50 +0100 Subject: [PATCH 1/1] libudev: add missing hunks This should have been committed with udev_device_add_property - implicitly mark properties for saving to db --- src/udev/udev-builtin.c | 7 +------ src/udev/udev-event.c | 4 +--- src/udev/udev-rules.c | 1 - 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c index d2aec1b20..fabc65380 100644 --- a/src/udev/udev-builtin.c +++ b/src/udev/udev-builtin.c @@ -123,12 +123,7 @@ int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c } int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val) { - struct udev_list_entry *entry; - - entry = udev_device_add_property(dev, key, val); - /* store in db, skip private keys */ - if (key[0] != '.') - udev_list_entry_set_num(entry, true); + udev_device_add_property(dev, key, val); if (test) printf("%s=%s\n", key, val); diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c index 7d0d98ca0..67fb1f78f 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -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); } } diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 242091352..e8387d793 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -555,7 +555,6 @@ static int import_property_from_string(struct udev_device *dev, char *line) { char *key; char *val; size_t len; - struct udev_list_entry *entry; /* find key */ key = line; -- 2.30.2