SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev-rules: make import_file_into_properties() take sd_device

Browse Source
This commit is contained in:
Yu Watanabe
2018-11-07 13:35:03 +09:00
parent 29b5eb5adf
commit 13c7b75f2f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-rules.c
+3 -3
View File
@@ -615,7 +615,7 @@ static int import_property_from_string(sd_device *dev, char *line) {
return device_add_property(dev, key, val);
}
static int import_file_into_properties(struct udev_device *dev, const char *filename) {
static int import_file_into_properties(sd_device *dev, const char *filename) {
_cleanup_fclose_ FILE *f = NULL;
int r;
@@ -632,7 +632,7 @@ static int import_file_into_properties(struct udev_device *dev, const char *file
if (r == 0)
break;
(void) import_property_from_string(dev->device, line);
(void) import_property_from_string(dev, line);
}
return 0;
@@ -1975,7 +1975,7 @@ int udev_rules_apply_to_event(
char import[UTIL_PATH_SIZE];
udev_event_apply_format(event, rules_str(rules, cur->key.value_off), import, sizeof(import), false);
if (import_file_into_properties(event->dev, import) != 0)
if (import_file_into_properties(event->dev->device, import) != 0)
if (cur->key.op != OP_NOMATCH)
goto nomatch;
break;