aboutsummaryrefslogtreecommitdiff
path: root/wayland.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-03 00:26:42 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-03 00:26:42 +0000
commite1b6aa87fbb2b32ef27dfbe6d768d083ad040499 (patch)
tree172b129c621555dc24231f76d9737139300d73fe /wayland.c
parentslave: turn on FD_CLOEXEC after slave has been spawned (diff)
parentterminal: cleanup asynchronous ptmx output handling (diff)
Merge branch 'async-ptmx'
Diffstat (limited to 'wayland.c')
-rw-r--r--wayland.c11
1 files changed, 3 insertions, 8 deletions
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;
}