rename ...trailing_char() to ...trailing_chars()

[elogind.git] / udevinfo.c

diff --git a/udevinfo.c b/udevinfo.c
index 814bd1e90af94a83fca8be047dc863ecd7764fbb..c7d801b87c47bcb90e1842f628dc6d25e70bf384 100644 (file)
--- a/udevinfo.c
+++ b/udevinfo.c
@@ -88,6 +88,8 @@ static int print_record(struct udevice *udev)
        printf("N: %s\n", udev->name);
        list_for_each_entry(name_loop, &udev->symlink_list, node)
                printf("S: %s\n", name_loop->name);
+       list_for_each_entry(name_loop, &udev->env_list, node)
+               printf("E: %s\n", name_loop->name);
 
        return 0;
 }
@@ -168,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[])
@@ -319,9 +319,9 @@ int main(int argc, char *argv[], char *envp[])
                        } else
                                pos = name;
 
-                       retval = udev_db_search_name(devpath, sizeof(devpath), pos);
+                       retval = udev_db_lookup_name(pos, devpath, sizeof(devpath));
                        if (retval != 0) {
-                               fprintf(stderr, "device not found in database\n");
+                               fprintf(stderr, "no record for '%s' in database\n", pos);
                                goto exit;
                        }
                        udev_db_get_device(&udev, devpath);