X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev_rules.c;h=004a89f748e0529bebe5e06ba7056544e40e9083;hp=ce1f66ecd6364e6b7621a8a9cba7c7672f9c5d35;hb=df7ae680d88f77ff67f44a49c57dd0079b527a60;hpb=3b738db6eb3bf9221509f3dec8044c19bb48cb48

diff --git a/udev/udev_rules.c b/udev/udev_rules.c
index ce1f66ecd..004a89f74 100644
--- a/udev/udev_rules.c
+++ b/udev/udev_rules.c
@@ -1368,6 +1368,7 @@ nomatch:
 
 int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
 {
+	struct udev_rules_iter iter;
 	struct udev_rule *rule;
 	int name_set = 0;
 
@@ -1375,9 +1376,9 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
 	dbg(udevice->udev, "udevice->dev->kernel='%s'\n", udevice->dev->kernel);
 
 	/* look for a matching rule to apply */
-	udev_rules_iter_init(rules);
+	udev_rules_iter_init(&iter, rules);
 	while (1) {
-		rule = udev_rules_iter_next(rules);
+		rule = udev_rules_iter_next(&iter);
 		if (rule == NULL)
 			break;
 
@@ -1530,7 +1531,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
 
 			if (rule->goto_label.operation != KEY_OP_UNSET) {
 				dbg(udevice->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
-				udev_rules_iter_label(rules, key_val(rule, &rule->goto_label));
+				udev_rules_iter_label(&iter, key_val(rule, &rule->goto_label));
 			}
 		}
 	}
@@ -1551,14 +1552,15 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice)
 
 int udev_rules_get_run(struct udev_rules *rules, struct udevice *udevice)
 {
+	struct udev_rules_iter iter;
 	struct udev_rule *rule;
 
 	dbg(udevice->udev, "udevice->kernel='%s'\n", udevice->dev->kernel);
 
 	/* look for a matching rule to apply */
-	udev_rules_iter_init(rules);
+	udev_rules_iter_init(&iter, rules);
 	while (1) {
-		rule = udev_rules_iter_next(rules);
+		rule = udev_rules_iter_next(&iter);
 		if (rule == NULL)
 			break;
 
@@ -1609,7 +1611,7 @@ int udev_rules_get_run(struct udev_rules *rules, struct udevice *udevice)
 
 			if (rule->goto_label.operation != KEY_OP_UNSET) {
 				dbg(udevice->udev, "moving forward to label '%s'\n", key_val(rule, &rule->goto_label));
-				udev_rules_iter_label(rules, key_val(rule, &rule->goto_label));
+				udev_rules_iter_label(&iter, key_val(rule, &rule->goto_label));
 			}
 		}
 	}