[PATCH] remove the .udev.tdb when installing or uninstalling to be safe.

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 8b3f305d34effbe8d654a5094be98e00182a86ea..e615b4c8bb9e6a88b78d1e1ac72686ae349e3b73 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -24,6 +24,7 @@
 #define UDEV_H
 
 #include "libsysfs/libsysfs.h"
+#include <stddef.h>
 #include <sys/param.h>
 
 #define COMMENT_CHARACTER              '#'
@@ -32,8 +33,9 @@
 #define OWNER_SIZE     30
 #define GROUP_SIZE     30
 #define MODE_SIZE      8
-#define BOOL_SIZE      5       /* 'yes', 'no' and possibly 'true' or 'false'
-                                  in future */
+
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
 
 struct udevice {
        char name[NAME_SIZE];
@@ -42,14 +44,14 @@ struct udevice {
        char type;
        int major;
        int minor;
-       mode_t mode;
+       unsigned int mode;      /* not mode_t due to conflicting definitions in different libcs */
        char symlink[NAME_SIZE];
 
-       /* fields that help us in building strings */
-       unsigned char bus_id[SYSFS_NAME_LEN];
-       unsigned char program_result[NAME_SIZE];
-       unsigned char kernel_number[NAME_SIZE];
-       unsigned char kernel_name[NAME_SIZE];
+       /* private data that help us in building strings */
+       char bus_id[SYSFS_NAME_LEN];
+       char program_result[NAME_SIZE];
+       char kernel_number[NAME_SIZE];
+       char kernel_name[NAME_SIZE];
 };
 
 #define strfieldcpy(to, from) \
@@ -58,7 +60,7 @@ do { \
        strncpy(to, from, sizeof(to)-1); \
 } while (0)
 
-extern int udev_add_device(char *path, char *subsystem);
+extern int udev_add_device(char *path, char *subsystem, int fake);
 extern int udev_remove_device(char *path, char *subsystem);
 extern void udev_init_config(void);
 extern int parse_get_pair(char **orig_string, char **left, char **right);
@@ -74,6 +76,6 @@ 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 char udev_log_str[BOOL_SIZE];
+extern int udev_log;
 
 #endif