summaryrefslogtreecommitdiff
path: root/src/udev/udevadm-settle.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-01-24 15:00:06 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-02-20 06:17:42 +0900
commit100bc5bf98ed051e94667c9581f7098856527ee9 (patch)
treed202042ea23122e37373c5e1ac1bd10912dea990 /src/udev/udevadm-settle.c
parentebf963c551e1077abaa5e0fa0f330e6d1c23565e (diff)
downloadsystemd-100bc5bf98ed051e94667c9581f7098856527ee9.tar.gz
udev-ctrl: make udev_ctrl_new() return negative errno on failure
Diffstat (limited to 'src/udev/udevadm-settle.c')
-rw-r--r--src/udev/udevadm-settle.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index 8d9c4509ff..b4ea5a36a5 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -100,8 +100,7 @@ int settle_main(int argc, char *argv[], void *userdata) {
if (getuid() == 0) {
_cleanup_(udev_ctrl_unrefp) struct udev_ctrl *uctrl = NULL;
- uctrl = udev_ctrl_new();
- if (uctrl) {
+ if (udev_ctrl_new(&uctrl) >= 0) {
r = udev_ctrl_send_ping(uctrl, MAX(5 * USEC_PER_SEC, arg_timeout));
if (r < 0) {
log_debug_errno(r, "Failed to connect to udev daemon: %m");