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/poll.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/socketengines/poll.cpp b/src/socketengines/poll.cpp
index 7b00fcc6d..807d89c94 100644
--- a/src/socketengines/poll.cpp
+++ b/src/socketengines/poll.cpp
@@ -66,7 +66,7 @@ static int mask_to_poll(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;
@@ -102,7 +102,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 {
 	int fd = eh->GetFd();
-	if (fd < 0 || static_cast<unsigned int>(fd) >= fd_mappings.size() || fd_mappings[fd] == -1)
+	if (!eh->HasFd() || static_cast<unsigned int>(fd) >= fd_mappings.size() || fd_mappings[fd] == -1)
 	{
 		ServerInstance->Logs.Debug("SOCKET", "SetEvents() on unknown fd: %d", eh->GetFd());
 		return;
@@ -114,7 +114,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;
-- 
cgit v1.3.1-10-gc9f91