X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev.h;h=d17fc8c1ea717c4b9cdb3b80ea6ab1211e3cb218;hp=ed01da30e4e0514108ba9bd6f5562412a5f68cc3;hb=660d02b554b97fd4ce08d0a30d16487912687a13;hpb=4c83d994566718043e61e568cc214bdc4587f869

diff --git a/src/udev/udev.h b/src/udev/udev.h
index ed01da30e..d17fc8c1e 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -20,10 +20,9 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
-#include <signal.h>
 
 #include "macro.h"
-#include "sd-rtnl.h"
+#include "sd-netlink.h"
 #include "libudev.h"
 #include "libudev-private.h"
 #include "util.h"
@@ -44,11 +43,9 @@ struct udev_event {
         struct udev_list run_list;
         int exec_delay;
         usec_t birth_usec;
-        int fd_signal;
-        sd_rtnl *rtnl;
+        sd_netlink *rtnl;
         unsigned int builtin_run;
         unsigned int builtin_ret;
-        bool sigterm;
         bool inotify_watch;
         bool inotify_watch_final;
         bool group_set;
@@ -73,7 +70,9 @@ struct udev_rules;
 struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
 struct udev_rules *udev_rules_unref(struct udev_rules *rules);
 bool udev_rules_check_timestamp(struct udev_rules *rules);
-int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event, usec_t timeout_usec, const sigset_t *sigmask);
+int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event,
+                              usec_t timeout_usec, usec_t timeout_warn_usec,
+                              struct udev_list *properties_list);
 int udev_rules_apply_static_dev_perms(struct udev_rules *rules);
 
 /* udev-event.c */
@@ -84,10 +83,14 @@ int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
                                    char *result, size_t maxsize, int read_value);
 int udev_event_spawn(struct udev_event *event,
                      usec_t timeout_usec,
-                     const char *cmd, char **envp, const sigset_t *sigmask,
-                     char *result, size_t ressize);
-void udev_event_execute_rules(struct udev_event *event, usec_t timeout_usec, struct udev_rules *rules, const sigset_t *sigset);
-void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec, const sigset_t *sigset);
+                     usec_t timeout_warn_usec,
+                     bool accept_failure,
+                     const char *cmd, char *result, size_t ressize);
+void udev_event_execute_rules(struct udev_event *event,
+                              usec_t timeout_usec, usec_t timeout_warn_usec,
+                              struct udev_list *properties_list,
+                              struct udev_rules *rules);
+void udev_event_execute_run(struct udev_event *event, usec_t timeout_usec, usec_t timeout_warn_usec);
 int udev_build_argv(struct udev *udev, char *cmd, int *argc, char *argv[]);
 
 /* udev-watch.c */
@@ -194,11 +197,6 @@ int udev_builtin_add_property(struct udev_device *dev, bool test, const char *ke
 int udev_builtin_hwdb_lookup(struct udev_device *dev, const char *prefix, const char *modalias,
                              const char *filter, bool test);
 
-/* udev logging */
-void udev_main_log(struct udev *udev, int priority,
-                   const char *file, int line, const char *fn,
-                   const char *format, va_list args) _printf_(6, 0);
-
 /* udevadm commands */
 struct udevadm_cmd {
         const char *name;