X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=8b3f305d34effbe8d654a5094be98e00182a86ea;hp=05f6b3c2256be08a72860b7399e09c8ed24b2364;hb=4d803d8d04a8493f8efc039c7789c65be33048a0;hpb=7ac0feeb6044470569d7ece5d34a76acdb03fc64

diff --git a/udev.h b/udev.h
index 05f6b3c22..8b3f305d3 100644
--- a/udev.h
+++ b/udev.h
@@ -26,35 +26,14 @@
 #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)));
-
 #define COMMENT_CHARACTER		'#'
 
 #define NAME_SIZE	100
 #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 */
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -68,9 +47,9 @@ struct udevice {
 
 	/* 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) \
@@ -82,6 +61,7 @@ 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 int parse_get_pair(char **orig_string, char **left, char **right);
 
 extern char **main_argv;
 extern char **main_envp;
@@ -91,6 +71,9 @@ extern char udev_db_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];
+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];
 
 #endif