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] make the udev object available to more processing stages
[elogind.git]
/
namedev_parse.c
diff --git
a/namedev_parse.c
b/namedev_parse.c
index 22e3523f3d8b67c474d245a15359f2d1e2157993..73828a83b2f864d436c222d1085779db74bacd78 100644
(file)
--- a/
namedev_parse.c
+++ b/
namedev_parse.c
@@
-142,7
+142,7
@@
static char *get_key_attribute(char *str)
return NULL;
}
return NULL;
}
-static int namedev_parse_rules(c
har *filename
)
+static int namedev_parse_rules(c
onst char *filename, void *data
)
{
char line[LINE_SIZE];
char *bufline;
{
char line[LINE_SIZE];
char *bufline;
@@
-343,7
+343,7
@@
error:
return retval;
}
return retval;
}
-static int namedev_parse_permissions(c
har *filename
)
+static int namedev_parse_permissions(c
onst char *filename, void *data
)
{
char line[LINE_SIZE];
char *bufline;
{
char line[LINE_SIZE];
char *bufline;
@@
-447,10
+447,10
@@
int namedev_init_rules(void)
stat(udev_rules_filename, &stats);
if ((stats.st_mode & S_IFMT) != S_IFDIR)
stat(udev_rules_filename, &stats);
if ((stats.st_mode & S_IFMT) != S_IFDIR)
- return namedev_parse_rules(udev_rules_filename);
+ return namedev_parse_rules(udev_rules_filename
, NULL
);
else
else
- return call_foreach_file(namedev_parse_rules,
-
udev_rules_filename, RULEFILE_SUFFIX
);
+ return call_foreach_file(namedev_parse_rules,
udev_rules_filename,
+
RULEFILE_SUFFIX, NULL
);
}
int namedev_init_permissions(void)
}
int namedev_init_permissions(void)
@@
-459,8
+459,8
@@
int namedev_init_permissions(void)
stat(udev_permissions_filename, &stats);
if ((stats.st_mode & S_IFMT) != S_IFDIR)
stat(udev_permissions_filename, &stats);
if ((stats.st_mode & S_IFMT) != S_IFDIR)
- return namedev_parse_permissions(udev_permissions_filename);
+ return namedev_parse_permissions(udev_permissions_filename
, NULL
);
else
else
- return call_foreach_file(namedev_parse_permissions,
-
udev_permissions_filename, PERMFILE_SUFFIX
);
+ return call_foreach_file(namedev_parse_permissions,
udev_permissions_filename,
+
PERMFILE_SUFFIX, NULL
);
}
}