diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2016-12-06 06:51:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 06:51:55 +0300 |
| commit | d0569c7e9af341b7423a61df70f05dbabc0fff1c (patch) | |
| tree | b2cc9d9c2d3878daefc9f00f8deb7130d70b053f | |
| parent | 95977da98ca9b300af5ac1212200a3ad36b5ec51 (diff) | |
| parent | 8fb242abc9132fe4c230457870e63d3fdb691493 (diff) | |
Merge pull request #4838 from phomes/misc-cleanup2
Misc cleanups
| -rw-r--r-- | src/core/device.c | 2 | ||||
| -rw-r--r-- | src/udev/udevadm-monitor.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/device.c b/src/core/device.c index 074e93ffe2..e345552f24 100644 --- 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 11abebb351..f631834341 100644 --- 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); |