cdrom_id: add error message if open() fails

[elogind.git] / udev / udevadm-monitor.c

diff --git a/udev/udevadm-monitor.c b/udev/udevadm-monitor.c
index 27520f70614f90d25076d0452790d26a2c3777b0..1f0946114dd04e56d1f78873d2d46fd9bdc3acf5 100644 (file)
--- a/udev/udevadm-monitor.c
+++ b/udev/udevadm-monitor.c
@@ -35,7 +35,7 @@
 
 static int udev_exit;
 
-static void asmlinkage sig_handler(int signum)
+static void sig_handler(int signum)
 {
        if (signum == SIGINT || signum == SIGTERM)
                udev_exit = 1;
@@ -107,7 +107,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
                                char subsys[UTIL_NAME_SIZE];
                                char *devtype;
 
-                               util_strlcpy(subsys, optarg, sizeof(subsys));
+                               util_strscpy(subsys, sizeof(subsys), optarg);
                                devtype = strchr(subsys, ':');
                                if (devtype != NULL) {
                                        devtype[0] = '\0';
@@ -135,7 +135,7 @@ int udevadm_monitor(struct udev *udev, int argc, char *argv[])
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(struct sigaction));
-       act.sa_handler = (void (*)(int)) sig_handler;
+       act.sa_handler = sig_handler;
        sigemptyset(&act.sa_mask);
        act.sa_flags = SA_RESTART;
        sigaction(SIGINT, &act, NULL);