diff options
| author | Daniel Mack <github@zonque.org> | 2015-06-24 00:12:28 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-06-24 00:12:28 +0200 |
| commit | 0891c5ed0b8d9ae20cae585d87da483d5d9c1e67 (patch) | |
| tree | 169eab1125e06cc094baeab06173c0f6e5cef949 /src/udev/udevd.c | |
| parent | 3f9340a685ad51d1f7266e22e6f2720b54ae7e9d (diff) | |
| parent | 56b13bcc992f296a061d9ae39d9369a8427bca73 (diff) | |
Merge pull request #339 from teg/udev-coverity
coverity fixes in udev
Diffstat (limited to 'src/udev/udevd.c')
| -rw-r--r-- | src/udev/udevd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c index ff15664cb4..cf15ddf641 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -327,6 +327,7 @@ static void worker_spawn(Manager *manager, struct event *event) { struct udev *udev = event->udev; _cleanup_udev_monitor_unref_ struct udev_monitor *worker_monitor = NULL; pid_t pid; + int r = 0; /* listen for new events */ worker_monitor = udev_monitor_new_from_netlink(udev, NULL); @@ -334,7 +335,9 @@ static void worker_spawn(Manager *manager, struct event *event) { return; /* allow the main daemon netlink address to send devices to the worker */ udev_monitor_allow_unicast_sender(worker_monitor, manager->monitor); - udev_monitor_enable_receiving(worker_monitor); + r = udev_monitor_enable_receiving(worker_monitor); + if (r < 0) + log_error_errno(r, "worker: could not enable receiving of device: %m"); pid = fork(); switch (pid) { @@ -346,7 +349,6 @@ static void worker_spawn(Manager *manager, struct event *event) { struct epoll_event ep_signal = { .events = EPOLLIN }; struct epoll_event ep_monitor = { .events = EPOLLIN }; sigset_t mask; - int r = 0; /* take initial device from queue */ dev = event->dev; @@ -528,7 +530,6 @@ out: default: { struct worker *worker; - int r; r = worker_new(&worker, manager, worker_monitor, pid); if (r < 0) |