From b1098712771ab823042fcf8614a706c76c2ff401 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Sun, 22 Oct 2017 02:27:25 +0100
Subject: Convert GetMaxFds() to size_t and deduplicate setting code.

---
 src/socketengines/socketengine_select.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index 42f634db1..03f0aca62 100644
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -35,7 +35,7 @@ namespace
 
 void SocketEngine::Init()
 {
-	MAX_DESCRIPTORS = FD_SETSIZE;
+	MaxSetSize = FD_SETSIZE;
 
 	FD_ZERO(&ReadSet);
 	FD_ZERO(&WriteSet);
@@ -53,7 +53,11 @@ void SocketEngine::RecoverFromFork()
 bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 {
 	int fd = eh->GetFd();
-	if ((fd < 0) || (fd > GetMaxFds() - 1))
+
+	if (fd < 0)
+		return false;
+
+	if (static_cast<size_t>(fd) >= GetMaxFds())
 		return false;
 
 	if (!SocketEngine::AddFdRef(eh))
@@ -73,7 +77,10 @@ void SocketEngine::DelFd(EventHandler* eh)
 {
 	int fd = eh->GetFd();
 
-	if ((fd < 0) || (fd > GetMaxFds() - 1))
+	if (fd < 0)
+		return;
+
+	if (static_cast<size_t>(fd) >= GetMaxFds())
 		return;
 
 	SocketEngine::DelFdRef(eh);
-- 
cgit v1.3.1-10-gc9f91