X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudevadm-test.c;h=c64e0456bb8f83fe0a38e42bf7813529c72dac0a;hp=090c524190b8cb34c5355002c189d784fd024839;hb=d7ddce186c8a0171eb98862b6f8ff72d64261b33;hpb=8460299b572eb13e7b97a0956b59c053f9009afa

diff --git a/udev/udevadm-test.c b/udev/udevadm-test.c
index 090c52419..c64e0456b 100644
--- a/udev/udevadm-test.c
+++ b/udev/udevadm-test.c
@@ -29,7 +29,6 @@
 #include <getopt.h>
 
 #include "udev.h"
-#include "udev-rules.h"
 
 int udevadm_test(struct udev *udev, int argc, char *argv[])
 {
@@ -39,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;
 
@@ -90,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, 0);
+	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) {
@@ -117,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_run(event, rules);
 
 	if (udev_device_get_event_timeout(dev) >= 0)
 		info(udev, "custom event timeout: %i\n", udev_device_get_event_timeout(dev));
@@ -136,6 +140,6 @@ int udevadm_test(struct udev *udev, int argc, char *argv[])
 	udev_event_unref(event);
 	udev_device_unref(dev);
 exit:
-	udev_rules_cleanup(&rules);
+	udev_rules_unref(rules);
 	return rc;
 }