X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Ftest-udev.c;h=ff1c353e6649d0e21e9d43df0087d8c0c4375c99;hp=4f8a7e4f66a2cbf4105ab058206532142080da14;hb=10b2d011e70ddf9361c61f6147dc88f670d28abd;hpb=d7ddce186c8a0171eb98862b6f8ff72d64261b33 diff --git a/udev/test-udev.c b/udev/test-udev.c index 4f8a7e4f6..ff1c353e6 100644 --- a/udev/test-udev.c +++ b/udev/test-udev.c @@ -58,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)); @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) goto exit; } - rules = udev_rules_new(udev, 0); + rules = udev_rules_new(udev, 1); util_strlcpy(syspath, udev_get_sys_path(udev), sizeof(syspath)); util_strlcat(syspath, devpath, sizeof(syspath)); @@ -97,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_unref(rules); exit: - selinux_exit(udev); + udev_selinux_exit(udev); udev_unref(udev); if (err != 0) return 1;