X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev_utils.c;h=60f5ad859a3e58dd7fa2950f3c9d0c83b00f8939;hb=fa548924d4bf723a310e040feaba3f417757de8a;hp=f2534dd331d3ade1d9da474949cdc39e44b02e4d;hpb=03cfa1394fcc2c4386f8af22e5a4d9fdd7cecc50;p=elogind.git

diff --git a/udev_utils.c b/udev_utils.c
index f2534dd33..60f5ad859 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -42,6 +42,7 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 	char *pos;
 
 	memset(udev, 0x00, sizeof(struct udevice));
+	INIT_LIST_HEAD(&udev->symlink_list);
 
 	if (subsystem)
 		strfieldcpy(udev->subsystem, subsystem);
@@ -89,6 +90,17 @@ int udev_init_device(struct udevice *udev, const char* devpath, const char *subs
 	return 0;
 }
 
+void udev_cleanup_device(struct udevice *udev)
+{
+	struct name_entry *name_loop;
+	struct name_entry *temp_loop;
+
+	list_for_each_entry_safe(name_loop, temp_loop, &udev->symlink_list, node) {
+		list_del(&name_loop->node);
+		free(name_loop);
+	}
+}
+
 int kernel_release_satisfactory(unsigned int version, unsigned int patchlevel, unsigned int sublevel)
 {
 	static unsigned int kversion = 0;
@@ -259,13 +271,7 @@ void no_trailing_slash(char *path)
 		path[--len] = '\0';
 }
 
-struct name_entry {
-	struct list_head node;
-	char name[NAME_SIZE];
-};
-
-/* sort files in lexical order */
-static int name_list_add(struct list_head *name_list, const char *name, int sort)
+int name_list_add(struct list_head *name_list, const char *name, int sort)
 {
 	struct name_entry *loop_name;
 	struct name_entry *new_name;
@@ -288,11 +294,13 @@ static int name_list_add(struct list_head *name_list, const char *name, int sort
 
 	strfieldcpy(new_name->name, name);
 	list_add_tail(&new_name->node, &loop_name->node);
+
 	return 0;
 }
 
 /* calls function for every file found in specified directory */
-int call_foreach_file(file_fnct_t fnct, const char *dirname, const char *suffix, void *data)
+int call_foreach_file(int (*handler_function)(struct udevice *udev, const char *string),
+		      struct udevice *udev, const char *dirname, const char *suffix)
 {
 	struct dirent *ent;
 	DIR *dir;
@@ -335,7 +343,7 @@ int call_foreach_file(file_fnct_t fnct, const char *dirname, const char *suffix,
 		snprintf(filename, NAME_SIZE, "%s/%s", dirname, loop_file->name);
 		filename[NAME_SIZE-1] = '\0';
 
-		fnct(filename, data);
+		handler_function(udev, filename);
 
 		list_del(&loop_file->node);
 		free(loop_file);