X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-monitor.c;h=64913dbd55cbfa9acd9067b48b25d04d7b06d957;hp=7ea7aa0f7067f76ba470036bb0f84b8714494584;hb=aa29418a13dc1e1eedca702663e733cc8d9f9859;hpb=1985c76e48753c200b5a15630b00245c3f60775b

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 7ea7aa0f7..64913dbd5 100644
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -72,8 +72,8 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[])
 	bool prop = false;
 	bool print_kernel = false;
 	bool print_udev = false;
-	struct udev_list_node subsystem_match_list;
-	struct udev_list_node tag_match_list;
+	struct udev_list subsystem_match_list;
+	struct udev_list tag_match_list;
 	struct udev_monitor *udev_monitor = NULL;
 	struct udev_monitor *kernel_monitor = NULL;
 	int fd_ep = -1;
@@ -92,8 +92,8 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[])
 		{}
 	};
 
-	udev_list_init(&subsystem_match_list);
-	udev_list_init(&tag_match_list);
+	udev_list_init(udev, &subsystem_match_list, true);
+	udev_list_init(udev, &tag_match_list, true);
 
 	for (;;) {
 		option = getopt_long(argc, argv, "pekus:t:h", options, NULL);
@@ -122,11 +122,11 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[])
 					devtype[0] = '\0';
 					devtype++;
 				}
-				udev_list_entry_add(udev, &subsystem_match_list, subsys, devtype, 0);
+				udev_list_entry_add(&subsystem_match_list, subsys, devtype);
 				break;
 			}
 		case 't':
-			udev_list_entry_add(udev, &tag_match_list, optarg, NULL, 0);
+			udev_list_entry_add(&tag_match_list, optarg, NULL);
 			break;
 		case 'h':
 			printf("Usage: udevadm monitor [--property] [--kernel] [--udev] [--help]\n"
@@ -285,8 +285,8 @@ out:
 		close(fd_ep);
 	udev_monitor_unref(udev_monitor);
 	udev_monitor_unref(kernel_monitor);
-	udev_list_cleanup_entries(udev, &subsystem_match_list);
-	udev_list_cleanup_entries(udev, &tag_match_list);
+	udev_list_cleanup(&subsystem_match_list);
+	udev_list_cleanup(&tag_match_list);
 	return rc;
 }