X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=0111644efffd5612f77b37e99962f82ba0b2c844;hb=a866c0a305372305bc8363b8f3b24832082711aa;hp=0703b884cfd85b5c75392fa0afbff5d306963913;hpb=2af003feb21e79b68b048c212bb898b293b75421;p=elogind.git

diff --git a/udev.h b/udev.h
index 0703b884c..0111644ef 100644
--- a/udev.h
+++ b/udev.h
@@ -30,9 +30,7 @@
 #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
@@ -53,8 +51,8 @@ struct udevice {
 
 	char name[NAME_SIZE];
 	char symlink[NAME_SIZE];
-	char owner[OWNER_SIZE];
-	char group[GROUP_SIZE];
+	char owner[USER_SIZE];
+	char group[USER_SIZE];
 	mode_t mode;
 	char type;
 	int major;
@@ -65,7 +63,6 @@ struct udevice {
 	int ignore_remove;
 	int config_line;
 	char config_file[NAME_SIZE];
-	long config_uptime;
 	char bus_id[SYSFS_NAME_LEN];
 	char program_result[NAME_SIZE];
 	char kernel_number[NAME_SIZE];
@@ -83,12 +80,11 @@ extern void udev_multiplex_directory(struct udevice *udev, const char *basedir,
 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 mode_t default_mode;
+extern char default_owner[USER_SIZE];
+extern char default_group[USER_SIZE];
 extern int udev_log;
 extern int udev_dev_d;
 extern int udev_hotplug_d;