[PATCH] udev - reverse user query options

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index 05f6b3c2256be08a72860b7399e09c8ed24b2364..90aa82393911bafece7d3d9d59ef9882e9214aff 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -26,30 +26,6 @@
 #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
@@ -68,9 +44,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) \