From ae38212c1ce829c783edf971081c90137abb49a0 Mon Sep 17 00:00:00 2001
From: Naram Qashat <cyberbotx@cyberbotx.com>
Date: Sun, 25 Jul 2010 21:58:20 -0400
Subject: Epic commit to replace most of the strings in Anope with a single
 Anope::string class, plus some other little fixes here and there.  If you
 follow 1.9.x development and are testing things, THIS is one of those things
 that NEEDS testing.

---
 modules/socketengines/m_socketengine_epoll.cpp  | 34 ++++++++-----------------
 modules/socketengines/m_socketengine_select.cpp | 26 +++++--------------
 2 files changed, 18 insertions(+), 42 deletions(-)

(limited to 'modules/socketengines')

diff --git a/modules/socketengines/m_socketengine_epoll.cpp b/modules/socketengines/m_socketengine_epoll.cpp
index c5e152af3..b65656554 100644
--- a/modules/socketengines/m_socketengine_epoll.cpp
+++ b/modules/socketengines/m_socketengine_epoll.cpp
@@ -17,7 +17,7 @@ class SocketEngineEPoll : public SocketEngineBase
 	{
 		SocketCount = 0;
 		max = ulimit(4, 0);
-		
+
 		if (max <= 0)
 		{
 			Alog() << "Can't determine maximum number of open sockets";
@@ -29,7 +29,7 @@ class SocketEngineEPoll : public SocketEngineBase
 		if (EngineHandle == -1)
 		{
 			Alog() << "Could not initialize epoll socket engine: " << strerror(errno);
-			throw ModuleException("Could not initialize epoll socket engine: " + std::string(strerror(errno)));
+			throw ModuleException(Anope::string("Could not initialize epoll socket engine: ") + strerror(errno));
 		}
 
 		events = new epoll_event[max];
@@ -44,7 +44,7 @@ class SocketEngineEPoll : public SocketEngineBase
 	void AddSocket(Socket *s)
 	{
 		epoll_event ev;
-		
+
 		memset(&ev, 0, sizeof(ev));
 
 		ev.events = EPOLLIN | EPOLLOUT;
@@ -82,7 +82,7 @@ class SocketEngineEPoll : public SocketEngineBase
 
 	void Process()
 	{
-		int total = epoll_wait(EngineHandle, events, max - 1, (Config.ReadTimeout * 1000));
+		int total = epoll_wait(EngineHandle, events, max - 1, Config.ReadTimeout * 1000);
 
 		if (total == -1)
 		{
@@ -102,32 +102,20 @@ class SocketEngineEPoll : public SocketEngineBase
 				continue;
 			}
 
-			if (ev->events & EPOLLIN)
-			{
-				if (!s->ProcessRead())
-				{
-					s->SetFlag(SF_DEAD);
-				}
-			}
+			if ((ev->events & EPOLLIN) && !s->ProcessRead())
+				s->SetFlag(SF_DEAD);
 
-			if (ev->events & EPOLLOUT)
-			{
-				if (!s->ProcessWrite())
-				{
-					s->SetFlag(SF_DEAD);
-				}
-			}
+			if ((ev->events & EPOLLOUT) && !s->ProcessWrite())
+				s->SetFlag(SF_DEAD);
 		}
 
-		for (std::map<int, Socket *>::iterator it = Sockets.begin(), it_end = Sockets.end(); it != it_end;)
+		for (std::map<int, Socket *>::iterator it = Sockets.begin(), it_end = Sockets.end(); it != it_end; )
 		{
 			Socket *s = it->second;
 			++it;
 
 			if (s->HasFlag(SF_DEAD))
-			{
 				delete s;
-			}
 		}
 	}
 };
@@ -137,8 +125,9 @@ class ModuleSocketEngineEPoll : public Module
 	SocketEngineEPoll *engine;
 
  public:
-	ModuleSocketEngineEPoll(const std::string &modname, const std::string &creator) : Module(modname, creator)
+	ModuleSocketEngineEPoll(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
 	{
+		this->SetAuthor("Anope");
 		this->SetPermanent(true);
 		this->SetType(SOCKETENGINE);
 
@@ -154,4 +143,3 @@ class ModuleSocketEngineEPoll : public Module
 };
 
 MODULE_INIT(ModuleSocketEngineEPoll)
-
diff --git a/modules/socketengines/m_socketengine_select.cpp b/modules/socketengines/m_socketengine_select.cpp
index c7346f87c..e713915a3 100644
--- a/modules/socketengines/m_socketengine_select.cpp
+++ b/modules/socketengines/m_socketengine_select.cpp
@@ -79,31 +79,19 @@ class SocketEngineSelect : public SocketEngineBase
 					s->SetFlag(SF_DEAD);
 					continue;
 				}
-				if (FD_ISSET(s->GetSock(), &rfdset))
-				{
-					if (!s->ProcessRead())
-					{
-						s->SetFlag(SF_DEAD);
-					}
-				}
-				if (FD_ISSET(s->GetSock(), &wfdset))
-				{
-					if (!s->ProcessWrite())
-					{
-						s->SetFlag(SF_DEAD);
-					}
-				}
+				if (FD_ISSET(s->GetSock(), &rfdset) && !s->ProcessRead())
+					s->SetFlag(SF_DEAD);
+				if (FD_ISSET(s->GetSock(), &wfdset) && !s->ProcessWrite())
+					s->SetFlag(SF_DEAD);
 			}
 
-			for (std::map<int, Socket *>::iterator it = Sockets.begin(), it_end = Sockets.end(); it != it_end;)
+			for (std::map<int, Socket *>::iterator it = Sockets.begin(), it_end = Sockets.end(); it != it_end; )
 			{
 				Socket *s = it->second;
 				++it;
 
 				if (s->HasFlag(SF_DEAD))
-				{
 					delete s;
-				}
 			}
 		}
 	}
@@ -114,8 +102,9 @@ class ModuleSocketEngineSelect : public Module
 	SocketEngineSelect *engine;
 
  public:
-	ModuleSocketEngineSelect(const std::string &modname, const std::string &creator) : Module(modname, creator)
+	ModuleSocketEngineSelect(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator)
 	{
+		this->SetAuthor("Anope");
 		this->SetPermanent(true);
 		this->SetType(SOCKETENGINE);
 
@@ -131,4 +120,3 @@ class ModuleSocketEngineSelect : public Module
 };
 
 MODULE_INIT(ModuleSocketEngineSelect)
-
-- 
cgit