chiark / gitweb /
remove 'udevadm trigger --type=failed' and SYSFS, ID, BUS keys
[elogind.git] / libudev / test-libudev.c
index 9dc86bd918aed2cdaba6216ecdb18f5e6d59fc49..c325f8eef57b38d37356791c3eca6cd96c08f275 100644 (file)
@@ -221,7 +221,7 @@ static int test_enumerate_print_list(struct udev_enumerate *enumerate)
 
 static int test_monitor(struct udev *udev)
 {
-       struct udev_monitor *udev_monitor;
+       struct udev_monitor *udev_monitor = NULL;
        int fd_ep;
        int fd_udev = -1;
        struct epoll_event ep_udev, ep_stdin;
@@ -286,9 +286,7 @@ static int test_monitor(struct udev *udev)
                                }
                                print_device(device);
                                udev_device_unref(device);
-                       }
-
-                       if (ev[i].data.fd == STDIN_FILENO && ev[i].events & EPOLLIN) {
+                       } else if (ev[i].data.fd == STDIN_FILENO && ev[i].events & EPOLLIN) {
                                printf("exiting loop\n");
                                goto out;
                        }
@@ -325,10 +323,6 @@ static int test_queue(struct udev *udev)
        udev_list_entry_foreach(list_entry, udev_queue_get_queued_list_entry(udev_queue))
                printf("queued: '%s' [%s]\n", udev_list_entry_get_name(list_entry), udev_list_entry_get_value(list_entry));
        printf("\n");
-       printf("get failed list\n");
-       udev_list_entry_foreach(list_entry, udev_queue_get_failed_list_entry(udev_queue))
-               printf("failed: '%s'\n", udev_list_entry_get_name(list_entry));
-       printf("\n");
 
        list_entry = udev_queue_get_queued_list_entry(udev_queue);
        if (list_entry != NULL) {