X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=e5c983a212c1eb84c6ef6c3e778c29e1dc44bc1b;hb=be9b51f6638d66025ebde1ca154ae9180383409c;hp=4ea04d5e715093b9d451ea82e8d5e801ba6cbaae;hpb=5aebfbcb62614fc2bf2b1579d62e3fe272c6751a;p=elogind.git

diff --git a/udev.h b/udev.h
index 4ea04d5e7..e5c983a21 100644
--- a/udev.h
+++ b/udev.h
@@ -26,35 +26,12 @@
 #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
 
 struct udevice {
 	char name[NAME_SIZE];
@@ -68,9 +45,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) \
@@ -91,15 +68,8 @@ 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];
-
-#ifdef USE_DBUS
-
-#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/dbus.h>
-
-extern DBusConnection* sysbus_connection;
-
-#endif /* USE_DBUS */
+extern char default_mode_str[MODE_SIZE];
+extern char default_owner_str[OWNER_SIZE];
+extern char default_group_str[GROUP_SIZE];
 
 #endif