X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=d681ad5613a92c4af782d5243a2c6b78e454bfac;hb=38895e573c6f17014393dc35a9e53d5f016172c3;hp=94d1676c90d4e1def5c17572f7ddae2ebf133f98;hpb=ff9a488d8c559a2ee40e522cdc68b750670711e4;p=elogind.git

diff --git a/udev.h b/udev.h
index 94d1676c9..d681ad561 100644
--- a/udev.h
+++ b/udev.h
@@ -27,16 +27,14 @@
 
 #include "list.h"
 #include "logging.h"
-#include "udev_libc_wrapper.h"
+#include "udev_sysdeps.h"
 #include "udev_version.h"
 
 #define COMMENT_CHARACTER			'#'
 #define PATH_TO_NAME_CHAR			'@'
 #define LINE_SIZE				512
+#define PATH_SIZE				512
 #define NAME_SIZE				128
-#define PATH_SIZE				256
-#define USER_SIZE				32
-#define SEQNUM_SIZE				32
 #define VALUE_SIZE				128
 
 #define DEFAULT_PARTITIONS_COUNT		15
@@ -56,8 +54,8 @@ struct sysfs_device {
 	struct list_head node;			/* for device cache */
 	struct sysfs_device *parent;		/* already cached parent*/
 	char devpath[PATH_SIZE];
-	char subsystem[NAME_SIZE];		/* $class/$bus/"drivers" */
-	char kernel_name[NAME_SIZE];		/* device instance name */
+	char subsystem[NAME_SIZE];		/* $class, $bus, drivers, module */
+	char kernel[NAME_SIZE];			/* device instance name */
 	char kernel_number[NAME_SIZE];
 	char driver[NAME_SIZE];			/* device driver name */
 };
@@ -73,9 +71,9 @@ struct udevice {
 	char name[PATH_SIZE];
 	struct list_head symlink_list;
 	int symlink_final;
-	char owner[USER_SIZE];
+	char owner[NAME_SIZE];
 	int owner_final;
-	char group[USER_SIZE];
+	char group[NAME_SIZE];
 	int group_final;
 	mode_t mode;
 	int mode_final;
@@ -111,7 +109,8 @@ extern dev_t udev_device_get_devt(struct udevice *udev);
 extern char sysfs_path[PATH_SIZE];
 extern int sysfs_init(void);
 extern void sysfs_cleanup(void);
-extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, const char *subsystem);
+extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath,
+				    const char *subsystem, const char *driver);
 extern struct sysfs_device *sysfs_device_get(const char *devpath);
 extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev);
 extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);
@@ -136,8 +135,8 @@ struct name_entry {
 	char name[PATH_SIZE];
 };
 extern int log_priority(const char *priority);
-extern int name_list_add(struct list_head *name_list, const char *name, int sort);
-extern int name_list_key_add(struct list_head *name_list, const char *key, const char *value);
+extern char *name_list_add(struct list_head *name_list, const char *name, int sort);
+extern char *name_list_key_add(struct list_head *name_list, const char *key, const char *value);
 extern void name_list_cleanup(struct list_head *name_list);
 extern int add_matching_files(struct list_head *name_list, const char *dirname, const char *suffix);