X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=2c8e0bff98101083ba85c4008c2591d1d20f3186;hp=99f6c36dde24a9835830fabcfef81d60e34f690b;hb=58d882a6d7f1374e97cf96e140b4fbede7f8e714;hpb=c7521974a39bcb68f313a324b8ec60ec11fed3d8

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 99f6c36dd..2c8e0bff9 100644
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -38,7 +38,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	const char *syspath = NULL;
 	struct udev_event *event;
 	struct udev_device *dev;
-	struct udev_rules rules = {};
+	struct udev_rules *rules = NULL;
 	int err;
 	int rc = 0;
 
@@ -89,7 +89,12 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	       "some values may be different, or not available at a simulation run.\n"
 	       "\n");
 
-	udev_rules_init(udev, &rules, 0);
+	rules = udev_rules_new(udev, 1);
+	if (rules == NULL) {
+		fprintf(stderr, "error reading rules\n");
+		rc = 1;
+		goto exit;
+	}
 
 	/* add /sys if needed */
 	if (strncmp(syspath, udev_get_sys_path(udev), strlen(udev_get_sys_path(udev))) != 0) {
@@ -116,7 +121,7 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	if (!force)
 		event->test = 1;
 
-	err = udev_event_run(event, &rules);
+	err = udev_event_execute_rules(event, rules);
 
 	if (udev_device_get_event_timeout(dev) >= 0)
 		info(udev, "custom event timeout: %i\n", udev_device_get_event_timeout(dev));
@@ -128,13 +133,13 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 			char program[UTIL_PATH_SIZE];
 
 			util_strlcpy(program, udev_list_entry_get_name(entry), sizeof(program));
-			udev_rules_apply_format(event, program, sizeof(program));
+			udev_event_apply_format(event, program, sizeof(program));
 			info(udev, "run: '%s'\n", program);
 		}
 	}
 	udev_event_unref(event);
 	udev_device_unref(dev);
 exit:
-	udev_rules_cleanup(&rules);
+	udev_rules_unref(rules);
 	return rc;
 }