From: Roy Marples <roy@marples.name>
Date: Tue, 9 Feb 2021 11:36:07 +0000 (+0000)
Subject: control: Don't log error deleting fds from eloop.
X-Git-Tag: v10.0.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53d15176c1479ab14dad74ba7a97141f584ce25b;p=thirdparty%2Fdhcpcd.git

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.
---

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)