diff options
author | Tom Gundersen <teg@jklm.no> | 2015-03-05 18:08:50 +0100 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2015-03-18 20:00:41 -0400 |
commit | bf79b2d789b781e2291170ef48d501a2cf4dd820 (patch) | |
tree | 59d8c34c35a3814e93d6ea3709f185f9cef17f4c | |
parent | a36d7fe55bb4135e81622a975b8b82ecd1c26511 (diff) |
libudev: add missing hunks
This should have been committed with
udev_device_add_property - implicitly mark properties for saving to db
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r-- | src/udev/udev-builtin.c | 7 | ||||
-rw-r--r-- | src/udev/udev-event.c | 4 | ||||
-rw-r--r-- | 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 82f644896c..74b3bdc58d 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 3875ce2e56..322ea65c40 100644 --- a/src/udev/udev-event.c +++ b/src/udev/udev-event.c @@ -842,13 +842,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 5bf66fb8ce..2522bcd24b 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -560,7 +560,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; |