[PATCH] remove default_* permissions from udev.conf file

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 1e3db5af27e95c4309e4ec24096ee43e8ba2f73c..07385ccec551930ce98a68fc9eb293c48cba4419 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -30,16 +30,14 @@
 #define COMMENT_CHARACTER              '#'
 
 #define NAME_SIZE                      256
-#define OWNER_SIZE                     32
-#define GROUP_SIZE                     32
-#define MODE_SIZE                      8
+#define USER_SIZE                      32
 
 #define ACTION_SIZE                    32
 #define DEVPATH_SIZE                   256
 #define SUBSYSTEM_SIZE                 32
 #define SEQNUM_SIZE                    32
 
-#define LINE_SIZE                      256
+#define LINE_SIZE                      512
 
 #define DEVD_DIR                       "/etc/dev.d"
 #define DEVD_SUFFIX                    ".dev"
@@ -50,26 +48,25 @@
 struct udevice {
        char devpath[DEVPATH_SIZE];
        char subsystem[SUBSYSTEM_SIZE];
-       char action[ACTION_SIZE];
+
        char name[NAME_SIZE];
-       char owner[OWNER_SIZE];
-       char group[GROUP_SIZE];
+       char symlink[NAME_SIZE];
+       char owner[USER_SIZE];
+       char group[USER_SIZE];
+       mode_t mode;
        char type;
        int major;
        int minor;
-       mode_t mode;
-       char symlink[NAME_SIZE];
+
+       char devname[NAME_SIZE];
        int partitions;
        int ignore_remove;
        int config_line;
        char config_file[NAME_SIZE];
-       long config_uptime;
        char bus_id[SYSFS_NAME_LEN];
-       char bus[SYSFS_NAME_LEN];
        char program_result[NAME_SIZE];
        char kernel_number[NAME_SIZE];
        char kernel_name[NAME_SIZE];
-       char devname[NAME_SIZE];
        int test_run;
 };
 
@@ -77,19 +74,15 @@ extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *clas
 extern int udev_remove_device(struct udevice *udev);
 extern void udev_init_config(void);
 extern int udev_start(void);
-extern int parse_get_pair(char **orig_string, char **left, char **right);
 extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 
 extern char sysfs_path[SYSFS_PATH_MAX];
 extern char udev_root[PATH_MAX];
 extern char udev_db_path[PATH_MAX+NAME_MAX];
-extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
 extern char udev_config_filename[PATH_MAX+NAME_MAX];
 extern char udev_rules_filename[PATH_MAX+NAME_MAX];
-extern char default_mode_str[MODE_SIZE];
-extern char default_owner_str[OWNER_SIZE];
-extern char default_group_str[GROUP_SIZE];
 extern int udev_log;
 extern int udev_dev_d;
+extern int udev_hotplug_d;
 
 #endif