From a4ec09b455605cb6030ba4c8ae1a6664ad1d7f8d Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Wed, 12 Oct 2022 18:38:16 +0100
Subject: Clean up various socket-related code.

---
 src/socketengines/epoll.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/socketengines/epoll.cpp')

diff --git a/src/socketengines/epoll.cpp b/src/socketengines/epoll.cpp
index cb1a4f2bb..6183e902c 100644
--- a/src/socketengines/epoll.cpp
+++ b/src/socketengines/epoll.cpp
@@ -88,7 +88,7 @@ static unsigned mask_to_epoll(int event_mask)
 bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 {
 	int fd = eh->GetFd();
-	if (fd < 0)
+	if (!eh->HasFd())
 	{
 		ServerInstance->Logs.Debug("SOCKET", "AddFd out of range: (fd: %d)", fd);
 		return false;
@@ -137,7 +137,7 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 void SocketEngine::DelFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
-	if (fd < 0)
+	if (!eh->HasFd())
 	{
 		ServerInstance->Logs.Debug("SOCKET", "DelFd out of range: (fd: %d)", fd);
 		return;
@@ -172,10 +172,10 @@ int SocketEngine::DispatchEvents()
 		const epoll_event ev = events[j];
 
 		EventHandler* const eh = static_cast<EventHandler*>(ev.data.ptr);
-		const int fd = eh->GetFd();
-		if (fd < 0)
+		if (!eh->HasFd())
 			continue;
 
+		const int fd = eh->GetFd();
 		if (ev.events & EPOLLHUP)
 		{
 			stats.ErrorEvents++;
-- 
cgit v1.3.1-10-gc9f91