[PATCH] update udev scsi_id to scsi_id 0.3

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 0c1951ad7875dee47c8461ca3d00bc863c2b2d87..90aa82393911bafece7d3d9d59ef9882e9214aff 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -26,35 +26,7 @@
 #include "libsysfs/libsysfs.h"
 #include <sys/param.h>
 
-#ifdef DEBUG
-#include <syslog.h>
-#define dbg(format, arg...)                                                            \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
-       } while (0)
-#else
-       #define dbg(format, arg...) do { } while (0)
-#endif
-
-/* Parser needs it's own debugging statement, we usually don't care about this at all */
-#ifdef DEBUG_PARSER
-#define dbg_parse(format, arg...)                                                      \
-       do {                                                                            \
-               log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg);        \
-       } while (0)
-#else
-       #define dbg_parse(format, arg...) do { } while (0)
-#endif
-
-
-extern int log_message (int level, const char *format, ...)
-       __attribute__ ((format (printf, 2, 3)));
-
-
-/* filenames for the config and database files */
-#define UDEV_DB                                ".udev.tdb"
-#define UDEV_CONFIG_PERMISSION_FILE    "udev.permissions"
-#define UDEV_CONFIG_FILE               "udev.config"
+#define COMMENT_CHARACTER              '#'
 
 #define NAME_SIZE      100
 #define OWNER_SIZE     30
@@ -68,12 +40,13 @@ struct udevice {
        int major;
        int minor;
        mode_t mode;
+       char symlink[NAME_SIZE];
 
        /* fields that help us in building strings */
        unsigned char bus_id[SYSFS_NAME_LEN];
-       unsigned char callout_value[NAME_SIZE];
+       unsigned char program_result[NAME_SIZE];
        unsigned char kernel_number[NAME_SIZE];
-
+       unsigned char kernel_name[NAME_SIZE];
 };
 
 #define strfieldcpy(to, from) \
@@ -84,14 +57,16 @@ do { \
 
 extern int udev_add_device(char *path, char *subsystem);
 extern int udev_remove_device(char *path, char *subsystem);
+extern void udev_init_config(void);
 
 extern char **main_argv;
 extern char **main_envp;
 extern char sysfs_path[SYSFS_PATH_MAX];
-extern char *udev_config_dir;
-extern char *udev_root;
+extern char udev_root[PATH_MAX];
 extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_config_permission_filename[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[NAME_MAX];
 
 #endif