remove "ignore_device"

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index bd3686b28a213b5991d934335f8fb62f947cc17e..555eae6311d7baa7b538cc0349261bcfcaf1f7c8 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -21,6 +21,7 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
+#include <signal.h>
 
 #include "libudev.h"
 #include "libudev-private.h"
@@ -28,11 +29,7 @@
 #define DEFAULT_FAKE_PARTITIONS_COUNT          15
 #define UDEV_EVENT_TIMEOUT                     180
 
-#define UDEV_CTRL_SOCK_PATH                    "@" UDEV_PREFIX "/org/kernel/udev/udevd"
-
-#define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
-#define READ_END                               0
-#define WRITE_END                              1
+#define UDEV_CTRL_SOCK_PATH                    "@/org/kernel/udev/udevd"
 
 struct udev_event {
        struct udev *udev;
@@ -51,7 +48,6 @@ struct udev_event {
        unsigned int name_final:1;
        unsigned int devlink_final:1;
        unsigned int run_final:1;
-       unsigned int ignore_device:1;
        unsigned int inotify_watch:1;
 };
 
@@ -71,7 +67,7 @@ int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event
 struct udev_event *udev_event_new(struct udev_device *dev);
 void udev_event_unref(struct udev_event *event);
 int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules);
-int udev_event_execute_run(struct udev_event *event);
+int udev_event_execute_run(struct udev_event *event, const sigset_t *sigset);
 size_t udev_event_apply_format(struct udev_event *event, const char *src, char *dest, size_t size);
 int udev_event_apply_subsys_kernel(struct udev_event *event, const char *string,
                                   char *result, size_t maxsize, int read_value);
@@ -89,32 +85,6 @@ int udev_node_add(struct udev_device *dev, mode_t mode, uid_t uid, gid_t gid);
 int udev_node_remove(struct udev_device *dev);
 void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev_old);
 
-/* udev-util.c */
-int util_create_path(struct udev *udev, const char *path);
-int util_delete_path(struct udev *udev, const char *path);
-int util_unlink_secure(struct udev *udev, const char *filename);
-uid_t util_lookup_user(struct udev *udev, const char *user);
-gid_t util_lookup_group(struct udev *udev, const char *group);
-int util_run_program(struct udev *udev, const char *command, char **envp,
-                    char *result, size_t ressize, size_t *reslen);
-int util_resolve_subsys_kernel(struct udev *udev, const char *string,
-                                     char *result, size_t maxsize, int read_value);
-
-/* udev-selinux.c */
-#ifndef USE_SELINUX
-static inline void udev_selinux_init(struct udev *udev) {}
-static inline void udev_selinux_exit(struct udev *udev) {}
-static inline void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode) {}
-static inline void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode) {}
-static inline void udev_selinux_resetfscreatecon(struct udev *udev) {}
-#else
-void udev_selinux_init(struct udev *udev);
-void udev_selinux_exit(struct udev *udev);
-void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
-void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
-void udev_selinux_resetfscreatecon(struct udev *udev);
-#endif
-
 /* udevadm commands */
 int udevadm_monitor(struct udev *udev, int argc, char *argv[]);
 int udevadm_info(struct udev *udev, int argc, char *argv[]);