replace useless defines by inline text

[elogind.git] / udev_rules.h

diff --git a/udev_rules.h b/udev_rules.h
index 2bf81075439d81021d355f68f689055c46d08805..fb77509cce541e32f1b1a0b10d24aae45cdc0740 100644 (file)
--- a/udev_rules.h
+++ b/udev_rules.h
@@ -27,32 +27,6 @@
 #include "udev.h"
 #include "list.h"
 
-
-#define KEY_KERNEL             "KERNEL"
-#define KEY_SUBSYSTEM          "SUBSYSTEM"
-#define KEY_ACTION             "ACTION"
-#define KEY_DEVPATH            "DEVPATH"
-#define KEY_BUS                        "BUS"
-#define KEY_ID                 "ID"
-#define KEY_PROGRAM            "PROGRAM"
-#define KEY_RESULT             "RESULT"
-#define KEY_DRIVER             "DRIVER"
-#define KEY_SYSFS              "SYSFS"
-#define KEY_ENV                        "ENV"
-#define KEY_MODALIAS           "MODALIAS"
-#define KEY_NAME               "NAME"
-#define KEY_SYMLINK            "SYMLINK"
-#define KEY_OWNER              "OWNER"
-#define KEY_GROUP              "GROUP"
-#define KEY_MODE               "MODE"
-#define KEY_RUN                        "RUN"
-#define KEY_OPTIONS            "OPTIONS"
-
-#define OPTION_LAST_RULE       "last_rule"
-#define OPTION_IGNORE_DEVICE   "ignore_device"
-#define OPTION_IGNORE_REMOVE   "ignore_remove"
-#define OPTION_PARTITIONS      "all_partitions"
-
 #define KEY_SYSFS_PAIRS_MAX    5
 #define KEY_ENV_PAIRS_MAX      5
 
@@ -76,7 +50,7 @@ struct key_pair {
 struct udev_rule {
        struct list_head node;
 
-       char kernel[NAME_SIZE];
+       char kernel_name[NAME_SIZE];
        enum key_operation kernel_operation;
        char subsystem[NAME_SIZE];
        enum key_operation subsystem_operation;
@@ -98,8 +72,11 @@ struct udev_rule {
        int sysfs_pair_count;
        struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
        int env_pair_count;
+       char modalias[NAME_SIZE];
        enum key_operation modalias_operation;
-       char modalias[PATH_SIZE];
+       char import[PATH_SIZE];
+       enum key_operation import_operation;
+       int import_exec;
 
        char name[PATH_SIZE];
        enum key_operation name_operation;
@@ -123,11 +100,13 @@ struct udev_rule {
        int config_line;
 };
 
-extern struct list_head udev_rule_list;
-
 extern int udev_rules_init(void);
+extern void udev_rules_close(void);
+
+extern int udev_rules_iter_init(void);
+extern struct udev_rule *udev_rules_iter_next(void);
+
 extern int udev_rules_get_name(struct udevice *udev, struct sysfs_class_device *class_dev);
 extern int udev_rules_get_run(struct udevice *udev, struct sysfs_device *sysfs_device);
-extern void udev_rules_close(void);
 
 #endif