From 13c7b75f2ff04ed0a4a3671e45c907770fbef1aa Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 29 Oct 2018 15:26:39 +0900 Subject: [PATCH] udev-rules: make import_file_into_properties() take sd_device --- src/udev/udev-rules.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 5c046ea838f..43e80c72786 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -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; -- 2.47.3