summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2021-02-09 11:36:07 +0000
committerRoy Marples <roy@marples.name>2021-02-09 11:36:07 +0000
commit53d15176c1479ab14dad74ba7a97141f584ce25b (patch)
tree98f53842a431025aa532617a49f831ea1b493cc6
parent44eccd184f0cf3a040c680a3070a347ee3a0f783 (diff)
downloaddhcpcd-53d15176c1479ab14dad74ba7a97141f584ce25b.tar.xz
control: Don't log error deleting fds from eloop.
They might not be added as they are inactive and its just noise as no operation is done anymore even for kqueue or epoll.
-rw-r--r--src/control.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/control.c b/src/control.c
index 270a5a04..ade13647 100644
--- a/src/control.c
+++ b/src/control.c
@@ -86,8 +86,7 @@ control_free(struct fd_list *fd)
fd->ctx->ps_control_client = NULL;
#endif
- if (eloop_event_delete(fd->ctx->eloop, fd->fd) == -1)
- logerr("%s: eloop_event_delete", __func__);
+ eloop_event_delete(fd->ctx->eloop, fd->fd);
close(fd->fd);
TAILQ_REMOVE(&fd->ctx->control_fds, fd, next);
control_queue_free(fd);
@@ -176,10 +175,8 @@ control_handle_write(struct fd_list *fd)
if (eloop_event_add(fd->ctx->eloop, fd->fd, ELE_READ,
control_handle_data, fd) == -1)
logerr("%s: eloop_event_add", __func__);
- } else {
- if (eloop_event_delete(fd->ctx->eloop, fd->fd) == -1)
- logerr("%s: eloop_event_delete", __func__);
- }
+ } else
+ eloop_event_delete(fd->ctx->eloop, fd->fd);
#ifdef PRIVSEP
if (IN_PRIVSEP_SE(fd->ctx) && !(fd->flags & FD_LISTEN)) {
if (ps_ctl_sendeof(fd) == -1)