aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2019-11-01 19:29:16 +0000
committerDaniel Eklöf <daniel@ekloef.se>2019-11-01 19:29:16 +0000
commitc824aa2ef57e5e16f9e56ac75d1161c03605b62d (patch)
tree0c232618b586608dcf276d138798b1d4749d6f07
parentterminal: delayed rendering: fdm_delayed_render() may be called with is_armged==false (diff)
terminal: fdm_del() closes the FD
-rw-r--r--terminal.c26
1 files changed, 6 insertions, 20 deletions
diff --git a/terminal.c b/terminal.c
index 7e7d3b53..3e4ecf12 100644
--- a/terminal.c
+++ b/terminal.c
@@ -458,26 +458,12 @@ err:
return NULL;
close_fds:
- if (ptmx != -1) {
- fdm_del(fdm, ptmx);
- close(ptmx);
- }
- if (flash_fd != -1) {
- fdm_del(fdm, flash_fd);
- close(flash_fd);
- }
- if (blink_fd != -1) {
- fdm_del(fdm, blink_fd);
- close(blink_fd);
- }
- if (delay_lower_fd != -1) {
- fdm_del(fdm, delay_lower_fd);
- close(delay_lower_fd);
- }
- if (delay_upper_fd != -1) {
- fdm_del(fdm, delay_upper_fd);
- close(delay_upper_fd);
- }
+ fdm_del(fdm, ptmx);
+ fdm_del(fdm, flash_fd);
+ fdm_del(fdm, blink_fd);
+ fdm_del(fdm, delay_lower_fd);
+ fdm_del(fdm, delay_upper_fd);
+
free(term);
return NULL;
}