Merge pull request #4838 from phomes/misc-cleanup2

Misc cleanups

diff --git a/src/core/device.c b/src/core/device.c
index 074e93ffe2ea0ea7ab4c9bdfb53831430d21cd6b..e345552f24935d67aa2a94a4e1b25050591036f3 100644 (file)
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -418,7 +418,7 @@ static int device_process_new(Manager *m, struct udev_device *dev) {
          * aliases */
         alias = udev_device_get_property_value(dev, "SYSTEMD_ALIAS");
         for (;;) {
-                _cleanup_free_ char *word = NULL, *k = NULL;
+                _cleanup_free_ char *word = NULL;
 
                 r = extract_first_word(&alias, &word, NULL, EXTRACT_QUOTES);
                 if (r == 0)

diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index 11abebb351add28e6190eaaf70e4ae800129f99f..f6318343415150369cc8335ca6d32775e9b3415f 100644 (file)
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -143,7 +143,7 @@ static int adm_monitor(struct udev *udev, int argc, char *argv[]) {
 
         /* set signal handlers */
         act.sa_handler = sig_handler;
-        act.sa_flags = SA_RESTART|SA_RESTART;
+        act.sa_flags = SA_RESTART;
         sigaction(SIGINT, &act, NULL);
         sigaction(SIGTERM, &act, NULL);
         sigemptyset(&mask);