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_volume_id: version 39
[elogind.git]
/
namedev_parse.c
diff --git
a/namedev_parse.c
b/namedev_parse.c
index ed38db4b142267e6f617cff36af0482c4306058a..e360565950c71768975891c8264f76e21031e3b7 100644
(file)
--- a/
namedev_parse.c
+++ b/
namedev_parse.c
@@
-98,7
+98,7
@@
static char *get_key_attribute(char *str)
return NULL;
}
return NULL;
}
-static int namedev_parse(
const char *filename, void *data
)
+static int namedev_parse(
struct udevice *udev, const char *filename
)
{
char line[LINE_SIZE];
char *bufline;
{
char line[LINE_SIZE];
char *bufline;
@@
-354,9
+354,9
@@
int namedev_init(void)
return -1;
if ((stats.st_mode & S_IFMT) != S_IFDIR)
return -1;
if ((stats.st_mode & S_IFMT) != S_IFDIR)
- retval = namedev_parse(
udev_rules_filename, NULL
);
+ retval = namedev_parse(
NULL, udev_rules_filename
);
else
else
- retval = call_foreach_file(namedev_parse,
udev_rules_filename, RULEFILE_SUFFIX, NULL
);
+ retval = call_foreach_file(namedev_parse,
NULL, udev_rules_filename, RULEFILE_SUFFIX
);
return retval;
}
return retval;
}
@@
-364,8
+364,9
@@
int namedev_init(void)
void namedev_close(void)
{
struct config_device *dev;
void namedev_close(void)
{
struct config_device *dev;
+ struct config_device *temp_dev;
- list_for_each_entry
(
dev, &config_device_list, node) {
+ list_for_each_entry
_safe(dev, temp_
dev, &config_device_list, node) {
list_del(&dev->node);
free(dev);
}
list_del(&dev->node);
free(dev);
}