summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-03-05 18:08:50 +0100
committerTom Gundersen <teg@jklm.no>2015-03-09 23:36:27 +0100
commitb94da8cf72aa363582e0acae134d45c88d13bc75 (patch)
treeb85fe86f5dd6f67a8cd4490b4acf3ba9d3d9f739 /src/udev
parent570b83cc62067f518c119e4803b4f234d1f0f01c (diff)
libudev: add missing hunks
This should have been committed with udev_device_add_property - implicitly mark properties for saving to db
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/udev-builtin.c7
-rw-r--r--src/udev/udev-event.c4
-rw-r--r--src/udev/udev-rules.c1
3 files changed, 2 insertions, 10 deletions
diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index d2aec1b200..fabc653800 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 7d0d98ca05..67fb1f78f5 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 2420913524..e8387d793a 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;