shrink struct udev_event

[elogind.git] / udev / udev.h

diff --git a/udev/udev.h b/udev/udev.h
index c73ec906e18a824759ea693ece5fbff11a9b17f6..927ff36e0116bdcdd45338d091085a51fe7f1b61 100644 (file)
--- a/udev/udev.h
+++ b/udev/udev.h
@@ -33,10 +33,6 @@
 #define DEFAULT_FAKE_PARTITIONS_COUNT          15
 #define UDEV_EVENT_TIMEOUT                     180
 
-/* linux/include/linux/kobject.h */
-#define UEVENT_BUFFER_SIZE                     2048
-#define UEVENT_NUM_ENVP                                32
-
 #define UDEV_CTRL_SOCK_PATH                    "@" UDEV_PREFIX "/org/kernel/udev/udevd"
 
 #define UDEV_MAX(a,b) ((a) > (b) ? (a) : (b))
@@ -65,18 +61,19 @@ struct udev_event {
        struct udev_device *dev;
        struct udev_device *dev_parent;
        int devlink_final;
-       int owner_final;
-       int group_final;
-       int mode_final;
-       char tmp_node[UTIL_PATH_SIZE];
-       char program_result[UTIL_PATH_SIZE];
-       int run_final;
-
        char name[UTIL_PATH_SIZE];
+       int name_final;
+       int name_ignore;
+       char *tmp_node;
+       char *program_result;
        mode_t mode;
-       char owner[UTIL_NAME_SIZE];
-       char group[UTIL_NAME_SIZE];
+       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;
 
@@ -90,8 +87,7 @@ struct udev_event {
 struct udev_rules;
 extern struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names);
 extern void udev_rules_unref(struct udev_rules *rules);
-extern int udev_rules_get_name(struct udev_rules *rules, struct udev_event *event);
-extern int udev_rules_get_run(struct udev_rules *rules, struct udev_event *event);
+extern int udev_rules_apply_to_event(struct udev_rules *rules, struct udev_event *event);
 
 /* udev-event.c */
 extern struct udev_event *udev_event_new(struct udev_device *dev);
@@ -104,29 +100,31 @@ 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, const char *owner, const char *group, int test);
+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);
 
 /* udev-util.c */
-extern int create_path(struct udev *udev, const char *path);
-extern int delete_path(struct udev *udev, const char *path);
-extern int unlink_secure(struct udev *udev, const char *filename);
-extern uid_t lookup_user(struct udev *udev, const char *user);
-extern gid_t lookup_group(struct udev *udev, const char *group);
-extern int run_program(struct udev *udev, const char *command, char **envp,
-                      char *result, size_t ressize, size_t *reslen);
+extern int util_create_path(struct udev *udev, const char *path);
+extern int util_delete_path(struct udev *udev, const char *path);
+extern int util_unlink_secure(struct udev *udev, const char *filename);
+extern uid_t util_lookup_user(struct udev *udev, const char *user);
+extern gid_t util_lookup_group(struct udev *udev, const char *group);
+extern int util_run_program(struct udev *udev, const char *command, char **envp,
+                           char *result, size_t ressize, size_t *reslen);
+extern 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 selinux_init(struct udev *udev) {}
-static inline void selinux_exit(struct udev *udev) {}
+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
-extern void selinux_init(struct udev *udev);
-extern void selinux_exit(struct udev *udev);
+extern void udev_selinux_init(struct udev *udev);
+extern void udev_selinux_exit(struct udev *udev);
 extern void udev_selinux_lsetfilecon(struct udev *udev, const char *file, unsigned int mode);
 extern void udev_selinux_setfscreatecon(struct udev *udev, const char *file, unsigned int mode);
 extern void udev_selinux_resetfscreatecon(struct udev *udev);