summaryrefslogtreecommitdiff
path: root/namedev_parse.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-03-04 21:33:57 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:39:48 -0700
commitf0308095c78fd68c29be9b3b391bc1c077afa04c (patch)
tree3a932afd373dd9b2ea447f392acf1dbf7392b037 /namedev_parse.c
parent03cfa1394fcc2c4386f8af22e5a4d9fdd7cecc50 (diff)
[PATCH] remove typedef for call_foreach_file() handler function
Diffstat (limited to 'namedev_parse.c')
-rw-r--r--namedev_parse.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/namedev_parse.c b/namedev_parse.c
index ed38db4b14..e360565950 100644
--- a/namedev_parse.c
+++ b/namedev_parse.c
@@ -98,7 +98,7 @@ static char *get_key_attribute(char *str)
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;
@@ -354,9 +354,9 @@ int namedev_init(void)
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
- 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;
}
@@ -364,8 +364,9 @@ int namedev_init(void)
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);
}