X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_rules.h;h=dac0dfcbb337bbbc5b2bce2ccdf05fa762508dd9;hb=c4edd0adb55ebf625a0f190071b930b469c58dd8;hp=125babf1c529bb3bb02dd7de5a940b45a1d037b7;hpb=1aa1e24848903d11780db1ade355be73ad61a937;p=elogind.git

diff --git a/udev_rules.h b/udev_rules.h
index 125babf1c..dac0dfcbb 100644
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -60,31 +60,34 @@ enum import_type {
 };
 
 struct udev_rule {
-	struct key label;
-	struct key goto_label;
-	struct key kernel_name;
-	struct key subsystem;
 	struct key action;
 	struct key devpath;
-	struct key bus;
-	struct key id;
+	struct key kernel;
+	struct key subsystem;
 	struct key driver;
+	struct key_pairs attr;
+
+	struct key kernels;
+	struct key subsystems;
+	struct key drivers;
+	struct key_pairs attrs;
+
+	struct key_pairs env;
 	struct key program;
 	struct key result;
-	struct key modalias;
 	struct key import;
 	enum import_type import_type;
+	struct key run;
 	struct key wait_for_sysfs;
-	struct key_pairs sysfs;
-	struct key_pairs env;
+	struct key label;
+	struct key goto_label;
 
 	struct key name;
 	struct key symlink;
-	struct key run;
 	struct key owner;
 	struct key group;
-	enum key_operation mode_operation;
 	mode_t mode;
+	enum key_operation mode_operation;
 
 	unsigned int partitions;
 	unsigned int last_rule:1,
@@ -105,8 +108,6 @@ struct udev_rules {
 extern int udev_rules_init(struct udev_rules *rules, int resolve_names);
 extern void udev_rules_cleanup(struct udev_rules *rules);
 
-extern void udev_apply_format(struct udevice *udev, char *string, size_t maxsize);
-
 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);
@@ -114,4 +115,6 @@ extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, const c
 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);
 
+extern void udev_rules_apply_format(struct udevice *udev, char *string, size_t maxsize);
+
 #endif