X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2Fudev_rules.h;h=b2e5d571ce7185561bf6109ed8bd1ab696f015a5;hb=1c7047ea77a417f183b6b92f4f5ea3728acef79b;hp=fe0f9dfbb5f0a2bf2e2f89ecd9834d3725799421;hpb=726687ad48bdececed1e7e44387c50e009e28208;p=elogind.git

diff --git a/udev/udev_rules.h b/udev/udev_rules.h
index fe0f9dfbb..b2e5d571c 100644
--- a/udev/udev_rules.h
+++ b/udev/udev_rules.h
@@ -24,7 +24,6 @@
 #include "list.h"
 
 #define PAIRS_MAX		5
-#define RULESFILE_SUFFIX	".rules"
 
 enum key_operation {
 	KEY_OP_UNSET,
@@ -109,18 +108,23 @@ struct udev_rule {
 };
 
 struct udev_rules {
+	struct udev *udev;
 	char *buf;
 	size_t bufsize;
-	size_t current;
 	int resolve_names;
 };
 
-extern int udev_rules_init(struct udev_rules *rules, int resolve_names);
+struct udev_rules_iter {
+	struct udev_rules *rules;
+	size_t current;
+};
+
+extern int udev_rules_init(struct udev *udev, struct udev_rules *rules, int resolve_names);
 extern void udev_rules_cleanup(struct udev_rules *rules);
 
-extern void udev_rules_iter_init(struct udev_rules *rules);
-extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules);
-extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const char *label);
+extern void udev_rules_iter_init(struct udev_rules_iter *iter, struct udev_rules *rules);
+extern struct udev_rule *udev_rules_iter_next(struct udev_rules_iter *iter);
+extern struct udev_rule *udev_rules_iter_label(struct udev_rules_iter *iter, const char *label);
 
 extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *udev);
 extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *udev);