udevadm: settle - fix typo

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index 927ff36e0116bdcdd45338d091085a51fe7f1b61..d1b207196e2937cb0ff171a0b79fb19cc61f4171 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -26,10 +26,6 @@
 #include "lib/libudev.h"
 #include "lib/libudev-private.h"
 
-#define ALLOWED_CHARS                          "#+-.:=@_"
-#define ALLOWED_CHARS_FILE                     ALLOWED_CHARS "/"
-#define ALLOWED_CHARS_INPUT                    ALLOWED_CHARS_FILE " $%?,"
-
 #define DEFAULT_FAKE_PARTITIONS_COUNT          15
 #define UDEV_EVENT_TIMEOUT                     180
 
@@ -57,30 +53,29 @@ static inline void logging_close(void)
 }
 
 struct udev_event {
+       struct udev_list_node node;
        struct udev *udev;
        struct udev_device *dev;
        struct udev_device *dev_parent;
-       int devlink_final;
-       char name[UTIL_PATH_SIZE];
-       int name_final;
-       int name_ignore;
+       char *name;
        char *tmp_node;
        char *program_result;
        mode_t mode;
-       int mode_final;
        uid_t uid;
-       int owner_final;
        gid_t gid;
-       int group_final;
        struct udev_list_node run_list;
-       int run_final;
-       int ignore_device;
-       int test;
-
-       struct udev_list_node node;
        pid_t pid;
        int exitstatus;
        time_t queue_time;
+       unsigned long long int delaying_seqnum;
+       unsigned int group_final:1;
+       unsigned int owner_final:1;
+       unsigned int mode_final:1;
+       unsigned int name_final:1;
+       unsigned int devlink_final:1;
+       unsigned int run_final:1;
+       unsigned int ignore_device:1;
+       unsigned int trace:1;
 };
 
 /* udev-rules.c */
@@ -100,9 +95,9 @@ extern int udev_event_apply_subsys_kernel(struct udev_event *event, const char *
 
 /* udev-node.c */
 extern int udev_node_mknod(struct udev_device *dev, const char *file, dev_t devnum, mode_t mode, uid_t uid, gid_t gid);
-extern int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid, int test);
-extern int udev_node_remove(struct udev_device *dev, int test);
-extern void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old, int test);
+extern int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
+extern int udev_node_remove(struct udev_device *dev);
+extern void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
 
 /* udev-util.c */
 extern int util_create_path(struct udev *udev, const char *path);