X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevinfo.c;h=c7d801b87c47bcb90e1842f628dc6d25e70bf384;hb=b2c6818dc35f7b149bba7bf963d1a3afb8daa867;hp=b546488c7e862db26fda31a7771a3bb5bad91b35;hpb=314edf3ca44b268fa70a7a87a106322e2dd461af;p=elogind.git

diff --git a/udevinfo.c b/udevinfo.c
index b546488c7..c7d801b87 100644
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -170,19 +170,17 @@ exit:
 static void dump_names(void) {
 	LIST_HEAD(name_list);
 	struct name_entry *name_loop;
-	struct name_entry *tmp_loop;
 
 	udev_db_get_all_entries(&name_list);
-	list_for_each_entry_safe(name_loop, tmp_loop, &name_list, node) {
+	list_for_each_entry(name_loop, &name_list, node) {
 		struct udevice udev_db;
 
 		udev_init_device(&udev_db, NULL, NULL, NULL);
-		if (udev_db_get_device(&udev_db, name_loop->name) == 0) {
+		if (udev_db_get_device(&udev_db, name_loop->name) == 0)
 			printf("%s=%s/%s\n", udev_db.devpath, udev_root, udev_db.name);
-			free(name_loop);
-		}
 		udev_cleanup_device(&udev_db);
 	}
+	name_list_cleanup(&name_list);
 }
 
 int main(int argc, char *argv[], char *envp[])
@@ -321,7 +319,7 @@ int main(int argc, char *argv[], char *envp[])
 			} else
 				pos = name;
 
-			retval = udev_db_search_name(pos, devpath, sizeof(devpath));
+			retval = udev_db_lookup_name(pos, devpath, sizeof(devpath));
 			if (retval != 0) {
 				fprintf(stderr, "no record for '%s' in database\n", pos);
 				goto exit;