X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.h;h=d0235996bc22fcf755d0f11bc9204a6f5612dd22;hp=a929e527561ba5ee0a5dd049187824c32a728654;hb=882af735ec18cb4e6ba6f59ca60f8266cc96c330;hpb=5e39f90b14ccf242618086a0242000fc11317a75

diff --git a/namedev.h b/namedev.h
index a929e5275..d0235996b 100644
--- a/namedev.h
+++ b/namedev.h
@@ -28,22 +28,13 @@
 
 struct sysfs_class_device;
 
-#define BUS_SIZE		32
-#define FILE_SIZE		64
-#define VALUE_SIZE		128
-#define ID_SIZE			64
-#define PLACE_SIZE		64
-#define DRIVER_SIZE		64
-#define PROGRAM_SIZE		128
-
+#define FIELD_KERNEL		"KERNEL"
+#define FIELD_SUBSYSTEM		"SUBSYSTEM"
 #define FIELD_BUS		"BUS"
 #define FIELD_SYSFS		"SYSFS"
 #define FIELD_ID		"ID"
-#define FIELD_PLACE		"PLACE"
 #define FIELD_PROGRAM		"PROGRAM"
 #define FIELD_RESULT		"RESULT"
-#define FIELD_KERNEL		"KERNEL"
-#define FIELD_SUBSYSTEM		"SUBSYSTEM"
 #define FIELD_DRIVER		"DRIVER"
 #define FIELD_NAME		"NAME"
 #define FIELD_SYMLINK		"SYMLINK"
@@ -52,16 +43,16 @@ struct sysfs_class_device;
 #define FIELD_MODE		"MODE"
 #define FIELD_OPTIONS		"OPTIONS"
 
-#define ATTR_IGNORE_DEVICE	"ignore_device"
-#define ATTR_IGNORE_REMOVE	"ignore_remove"
-#define ATTR_PARTITIONS		"all_partitions"
+#define OPTION_IGNORE_DEVICE	"ignore_device"
+#define OPTION_IGNORE_REMOVE	"ignore_remove"
+#define OPTION_PARTITIONS	"all_partitions"
 
 #define MAX_SYSFS_PAIRS		5
 
 #define RULEFILE_SUFFIX		".rules"
 
 struct sysfs_pair {
-	char file[FILE_SIZE];
+	char file[PATH_SIZE];
 	char value[VALUE_SIZE];
 };
 
@@ -69,16 +60,15 @@ struct config_device {
 	struct list_head node;
 
 	char kernel[NAME_SIZE];
-	char subsystem[SUBSYSTEM_SIZE];
-	char bus[BUS_SIZE];
-	char id[ID_SIZE];
-	char place[PLACE_SIZE];
+	char subsystem[NAME_SIZE];
+	char bus[NAME_SIZE];
+	char id[NAME_SIZE];
 	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
-	char program[PROGRAM_SIZE];
-	char result[PROGRAM_SIZE];
-	char driver[DRIVER_SIZE];
-	char name[NAME_SIZE];
-	char symlink[NAME_SIZE];
+	char program[PATH_SIZE];
+	char result[PATH_SIZE];
+	char driver[NAME_SIZE];
+	char name[PATH_SIZE];
+	char symlink[PATH_SIZE];
 
 	char owner[USER_SIZE];
 	char group[USER_SIZE];
@@ -88,7 +78,7 @@ struct config_device {
 	int ignore_device;
 	int ignore_remove;
 
-	char config_file[NAME_SIZE];
+	char config_file[PATH_SIZE];
 	int config_line;
 };