udevadm: test - remove --force option

[elogind.git] / udev / test-udev.c

diff --git a/udev/test-udev.c b/udev/test-udev.c
index 6c327a6e080b7a98888a844cefa83851138db032..ff1c353e6649d0e21e9d43df0087d8c0c4375c99 100644 (file)
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -29,7 +29,6 @@
 #include <grp.h>
 
 #include "udev.h"
-#include "udev_rules.h"
 
 static void asmlinkage sig_handler(int signum)
 {
@@ -47,7 +46,7 @@ int main(int argc, char *argv[])
        struct udev *udev;
        struct udev_event *event;
        struct udev_device *dev;
-       struct udev_rules rules;
+       struct udev_rules *rules;
        char syspath[UTIL_PATH_SIZE];
        const char *devpath;
        const char *action;
@@ -59,7 +58,7 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                exit(1);
        info(udev, "version %s\n", VERSION);
-       selinux_init(udev);
+       udev_selinux_init(udev);
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
@@ -82,7 +81,7 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
-       udev_rules_init(udev, &rules, 0);
+       rules = udev_rules_new(udev, 1);
 
        util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath));
        util_strlcat(syspath, devpath, sizeof(syspath));
@@ -98,21 +97,21 @@ int main(int argc, char *argv[])
 
        udev_device_set_action(dev, action);
        event = udev_event_new(dev);
-       err = udev_event_run(event, &rules);
+       err = udev_event_execute_rules(event, rules);
 
        /* rules may change/disable the timeout */
        if (udev_device_get_event_timeout(dev) >= 0)
                alarm(udev_device_get_event_timeout(dev));
 
        if (err == 0 && !event->ignore_device && udev_get_run(udev))
-               udev_rules_run(event);
+               udev_event_execute_run(event);
 
        udev_event_unref(event);
        udev_device_unref(dev);
 fail:
-       udev_rules_cleanup(&rules);
+       udev_rules_unref(rules);
 exit:
-       selinux_exit(udev);
+       udev_selinux_exit(udev);
        udev_unref(udev);
        if (err != 0)
                return 1;