diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2019-11-02 23:42:34 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2019-11-02 23:52:24 +0000 |
| commit | 777d851282a59fcfacc19b9232b9ad80c412efdf (patch) | |
| tree | f016bcc26da74f671cfb2f0f0c5334cea33472bf /fdm.c | |
| parent | Rename: vt_to_slave() -> term_to_slave() (diff) | |
fdm: invert check to get rid of one level of indentation
Diffstat (limited to 'fdm.c')
| -rw-r--r-- | fdm.c | 27 |
1 files changed, 14 insertions, 13 deletions
@@ -109,22 +109,23 @@ fdm_del_internal(struct fdm *fdm, int fd, bool close_fd) return true; tll_foreach(fdm->fds, it) { - if (it->item->fd == fd) { - if (epoll_ctl(fdm->epoll_fd, EPOLL_CTL_DEL, fd, NULL) < 0) - LOG_ERRNO("failed to unregister FD=%d from epoll", fd); + if (it->item->fd != fd) + continue; - if (close_fd) - close(it->item->fd); + if (epoll_ctl(fdm->epoll_fd, EPOLL_CTL_DEL, fd, NULL) < 0) + LOG_ERRNO("failed to unregister FD=%d from epoll", fd); - it->item->deleted = true; - if (fdm->is_polling) - tll_push_back(fdm->deferred_delete, it->item); - else - free(it->item); + if (close_fd) + close(it->item->fd); - tll_remove(fdm->fds, it); - return true; - } + it->item->deleted = true; + if (fdm->is_polling) + tll_push_back(fdm->deferred_delete, it->item); + else + free(it->item); + + tll_remove(fdm->fds, it); + return true; } LOG_ERR("no such FD: %d", fd); |
