From: Attila Molnar <attilamolnar@hush.com>
Date: Wed, 15 Apr 2015 21:49:05 +0000 (+0200)
Subject: Remove exception handling from StreamSocket methods calling IOHooks
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=dda1d696c1316b09d65763b4f12bc2b63cfbbe72;p=user%2Fhenk%2Fcode%2Finspircd.git

Remove exception handling from StreamSocket methods calling IOHooks

IOHooks don't throw exceptions
---

diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index fbeb60122..7ddd77495 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -114,15 +114,7 @@ void StreamSocket::Close()
 		DoWrite();
 		if (GetIOHook())
 		{
-			try
-			{
-				GetIOHook()->OnStreamSocketClose(this);
-			}
-			catch (CoreException& modexcept)
-			{
-				ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
-					modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
-			}
+			GetIOHook()->OnStreamSocketClose(this);
 			delete iohook;
 			DelIOHook();
 		}
@@ -151,17 +143,7 @@ void StreamSocket::DoRead()
 {
 	if (GetIOHook())
 	{
-		int rv = -1;
-		try
-		{
-			rv = GetIOHook()->OnStreamSocketRead(this, recvq);
-		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
-				modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
-			return;
-		}
+		int rv = GetIOHook()->OnStreamSocketRead(this, recvq);
 		if (rv > 0)
 			OnDataReady();
 		if (rv < 0)
@@ -219,8 +201,6 @@ void StreamSocket::DoWrite()
 
 	if (GetIOHook())
 	{
-		int rv = -1;
-		try
 		{
 			while (error.empty() && !sendq.empty())
 			{
@@ -246,7 +226,7 @@ void StreamSocket::DoWrite()
 				int itemlen = front.length();
 
 				{
-					rv = GetIOHook()->OnStreamSocketWrite(this, front);
+					int rv = GetIOHook()->OnStreamSocketWrite(this, front);
 					if (rv > 0)
 					{
 						// consumed the entire string, and is ready for more
@@ -270,11 +250,6 @@ void StreamSocket::DoWrite()
 				}
 			}
 		}
-		catch (CoreException& modexcept)
-		{
-			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "%s threw an exception: %s",
-				modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
-		}
 	}
 	else
 	{