From 79c3121aa34dbee4c3557fa058a864f229f8e313 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Sun, 3 Nov 2019 00:25:17 +0100 Subject: misc: fdm already logs failures --- wayland.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'wayland.c') diff --git a/wayland.c b/wayland.c index 2bbf8c2e..f4cba71c 100644 --- a/wayland.c +++ b/wayland.c @@ -522,14 +522,9 @@ wayl_init(struct fdm *fdm) goto out; } - int wl_fd = wl_display_get_fd(wayl->display); - if (!fdm_add(fdm, wl_fd, EPOLLIN, &fdm_wayl, wayl)) { - LOG_ERR("failed to register Wayland connection with the FDM"); - goto out; - } - - if (!fdm_add(fdm, wayl->kbd.repeat.fd, EPOLLIN, &fdm_repeat, wayl)) { - LOG_ERR("failed to register keyboard repeat timer with the FDM"); + if (!fdm_add(fdm, wl_display_get_fd(wayl->display), EPOLLIN, &fdm_wayl, wayl) || + !fdm_add(fdm, wayl->kbd.repeat.fd, EPOLLIN, &fdm_repeat, wayl)) + { goto out; } -- cgit v1.3