chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update .gitignore
[elogind.git]
/
src
/
udev
/
udev-rules.c
diff --git
a/src/udev/udev-rules.c
b/src/udev/udev-rules.c
index 401da5d8c5efa3a1ad2a89e3301115f067ae537c..4e85760bd4402a388573463e426ac362edcadf37 100644
(file)
--- a/
src/udev/udev-rules.c
+++ b/
src/udev/udev-rules.c
@@
-781,7
+781,6
@@
static int import_program_into_properties(struct udev_event *event, const char *
static int import_parent_into_properties(struct udev_device *dev, const char *filter)
{
static int import_parent_into_properties(struct udev_device *dev, const char *filter)
{
- struct udev *udev = udev_device_get_udev(dev);
struct udev_device *dev_parent;
struct udev_list_entry *list_entry;
struct udev_device *dev_parent;
struct udev_list_entry *list_entry;
@@
-969,7
+968,7
@@
static int get_key(struct udev *udev, char **line, char **key, enum operation_ty
}
/* extract possible KEY{attr} */
}
/* extract possible KEY{attr} */
-static char *get_key_attribute(struct udev *udev, char *str)
+static c
onst c
har *get_key_attribute(struct udev *udev, char *str)
{
char *pos;
char *attr;
{
char *pos;
char *attr;
@@
-1053,8
+1052,8
@@
static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
case TK_A_DB_PERSIST:
break;
case TK_A_RUN_BUILTIN:
case TK_A_DB_PERSIST:
break;
case TK_A_RUN_BUILTIN:
- token->key.builtin_cmd = *(enum udev_builtin_cmd *)data;
case TK_A_RUN_PROGRAM:
case TK_A_RUN_PROGRAM:
+ token->key.builtin_cmd = *(enum udev_builtin_cmd *)data;
token->key.value_off = add_string(rule_tmp->rules, value);
break;
case TK_A_INOTIFY_WATCH:
token->key.value_off = add_string(rule_tmp->rules, value);
break;
case TK_A_INOTIFY_WATCH:
@@
-1178,7
+1177,7
@@
static int add_rule(struct udev_rules *rules, char *line,
const char *filename, unsigned int filename_off, unsigned int lineno)
{
char *linepos;
const char *filename, unsigned int filename_off, unsigned int lineno)
{
char *linepos;
- char *attr;
+ c
onst c
har *attr;
struct rule_tmp rule_tmp;
memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));
struct rule_tmp rule_tmp;
memset(&rule_tmp, 0x00, sizeof(struct rule_tmp));