remove asmlinkage

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

diff --git a/udev/test-udev.c b/udev/test-udev.c
index 1cc83c4a694886ef0cae01c3eceeb5f951abc507..6ec91c174a20202f86d8471c04f18bbf06b139fd 100644 (file)
--- a/udev/test-udev.c
+++ b/udev/test-udev.c
@@ -30,14 +30,14 @@
 
 #include "udev.h"
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
        switch (signum) {
                case SIGALRM:
-                       exit(1);
+                       _exit(1);
                case SIGINT:
                case SIGTERM:
-                       exit(20 + signum);
+                       _exit(20 + signum);
        }
 }
 
@@ -58,11 +58,11 @@ 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));
-       act.sa_handler = (void (*)(int)) sig_handler;
+       act.sa_handler = sig_handler;
        sigemptyset (&act.sa_mask);
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
@@ -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));
@@ -111,7 +111,7 @@ int main(int argc, char *argv[])
 fail:
        udev_rules_unref(rules);
 exit:
-       selinux_exit(udev);
+       udev_selinux_exit(udev);
        udev_unref(udev);
        if (err != 0)
                return 1;