From 52acbb466b84a1cd161b1c111f855d6f0419fff3 Mon Sep 17 00:00:00 2001
From: brain
Date: Sat, 9 Jun 2007 12:32:34 +0000
Subject: A ton more clear() and empty() stuff thats been lingering on the long
 term todo for too long a term :p

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7264 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/m_spanningtree/utils.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/modules/m_spanningtree/utils.cpp')

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 6c4001503..8b191fa03 100644
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -409,7 +409,7 @@ void SpanningTreeUtilities::RefreshIPCache()
 	ValidIPs.clear();
 	for (std::vector<Link>::iterator L = LinkBlocks.begin(); L != LinkBlocks.end(); L++)
 	{
-		if ((L->IPAddr != "") && (L->RecvPass != "") && (L->SendPass != "") && (L->Name != "") && (L->Port))
+		if ((!L->IPAddr.empty()) && (!L->RecvPass.empty()) && (!L->SendPass.empty()) && (!L->Name.empty()) && (L->Port))
 		{
 			ValidIPs.push_back(L->IPAddr);
 
@@ -468,7 +468,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
 				while ((portno = portrange.GetToken()))
 				{
 					if (IP == "*")
-						IP = "";
+						IP.clear();
 
 					if ((!transport.empty()) && (hooks.find(transport.c_str()) ==  hooks.end()))
 					{
@@ -536,7 +536,7 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
 		/* Bugfix by brain, do not allow people to enter bad configurations */
 		if (L.Name != ServerInstance->Config->ServerName)
 		{
-			if ((L.IPAddr != "") && (L.RecvPass != "") && (L.SendPass != "") && (L.Name != "") && (L.Port))
+			if ((!L.IPAddr.empty()) && (!L.RecvPass.empty()) && (!L.SendPass.empty()) && (!L.Name.empty()) && (L.Port))
 			{
 				ValidIPs.push_back(L.IPAddr);
 
@@ -583,19 +583,19 @@ void SpanningTreeUtilities::ReadConfiguration(bool rebind)
 			}
 			else
 			{
-				if (L.IPAddr == "")
+				if (L.IPAddr.empty())
 				{
 					ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', IP address not defined!",L.Name.c_str());
 				}
-				else if (L.RecvPass == "")
+				else if (L.RecvPass.empty())
 				{
 					ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', recvpass not defined!",L.Name.c_str());
 				}
-				else if (L.SendPass == "")
+				else if (L.SendPass.empty())
 				{
 					ServerInstance->Log(DEFAULT,"Invalid configuration for server '%s', sendpass not defined!",L.Name.c_str());
 				}
-				else if (L.Name == "")
+				else if (L.Name.empty())
 				{
 					ServerInstance->Log(DEFAULT,"Invalid configuration, link tag without a name!");
 				}
-- 
cgit v1.3.1-10-gc9f91