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

(limited to 'src/threadsocket.cpp')

diff --git a/src/threadsocket.cpp b/src/threadsocket.cpp
index 323376b98..999b9eb25 100644
--- a/src/threadsocket.cpp
+++ b/src/threadsocket.cpp
@@ -46,13 +46,13 @@ public:
 
 	void Notify()
 	{
-		eventfd_write(fd, 1);
+		eventfd_write(GetFd(), 1);
 	}
 
 	void OnEventHandlerRead() override
 	{
 		eventfd_t dummy;
-		eventfd_read(fd, &dummy);
+		eventfd_read(GetFd(), &dummy);
 		parent->OnNotify();
 	}
 
@@ -86,14 +86,17 @@ SocketThread::SocketThread()
 class ThreadSignalSocket final
 	: public EventHandler
 {
+private:
 	SocketThread* parent;
 	int send_fd;
+
 public:
-	ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
-		parent(p), send_fd(sendfd)
+	ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd)
+		: parent(p)
+		, send_fd(sendfd)
 	{
 		SetFd(recvfd);
-		SocketEngine::NonBlocking(fd);
+		SocketEngine::NonBlocking(GetFd());
 		SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
 	}
 
@@ -112,7 +115,7 @@ public:
 	void OnEventHandlerRead() override
 	{
 		char dummy[128];
-		read(fd, dummy, 128);
+		read(GetFd(), dummy, 128);
 		parent->OnNotify();
 	}
 
-- 
cgit v1.3.1-10-gc9f91