chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev - mention format string escape char in man page
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index 4acbb61391fbb3e58eb3a5b4f42266881c187707..678731c7d194a0843dfceedf7368b0857262b19f 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-50,13
+50,6
@@
extern int log_message (int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
extern int log_message (int level, const char *format, ...)
__attribute__ ((format (printf, 2, 3)));
-
-/* default filenames for the config and database files */
-#define UDEV_CONFIG_FILE "udev.conf"
-#define UDEV_DB ".udev.tdb"
-#define UDEV_RULES_FILE "udev.rules"
-#define UDEV_PERMISSION_FILE "udev.permissions"
-
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 100
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 100
@@
-71,11
+64,13
@@
struct udevice {
int major;
int minor;
mode_t mode;
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];
/* 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_number[NAME_SIZE];
+ unsigned char kernel_name[NAME_SIZE];
};
};
@@
-92,11
+87,11
@@
extern void udev_init_config(void);
extern char **main_argv;
extern char **main_envp;
extern char sysfs_path[SYSFS_PATH_MAX];
extern char **main_argv;
extern char **main_envp;
extern char sysfs_path[SYSFS_PATH_MAX];
-extern char udev_config_dir[PATH_MAX];
extern char udev_root[PATH_MAX];
extern char udev_db_filename[PATH_MAX+NAME_MAX];
extern char udev_root[PATH_MAX];
extern char udev_db_filename[PATH_MAX+NAME_MAX];
-extern char udev_permission_filename[PATH_MAX+NAME_MAX];
+extern char udev_permission
s
_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 udev_config_filename[PATH_MAX+NAME_MAX];
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
+extern char default_mode_str[NAME_MAX];
#endif
#endif