X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.h;h=e5c983a212c1eb84c6ef6c3e778c29e1dc44bc1b;hb=be9b51f6638d66025ebde1ca154ae9180383409c;hp=678731c7d194a0843dfceedf7368b0857262b19f;hpb=ac28b86d631f23b5df74dbeb33e76a2b3f5d88bb;p=elogind.git diff --git a/udev.h b/udev.h index 678731c7d..e5c983a21 100644 --- a/udev.h +++ b/udev.h @@ -26,35 +26,12 @@ #include "libsysfs/libsysfs.h" #include -#ifdef DEBUG -#include -#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]; @@ -71,7 +48,6 @@ struct udevice { unsigned char program_result[NAME_SIZE]; unsigned char kernel_number[NAME_SIZE]; unsigned char kernel_name[NAME_SIZE]; - }; #define strfieldcpy(to, from) \ @@ -92,6 +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]; +extern char default_mode_str[MODE_SIZE]; +extern char default_owner_str[OWNER_SIZE]; +extern char default_group_str[GROUP_SIZE]; #endif