X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_whowas.cpp;h=1531f6239d74baf02d94e67caaac69e46a214fe8;hb=4c83624ed825ca123401a45c8d2844ba6453a85b;hp=10643680c1316c4a4fa0ac3b1605a98229b6e472;hpb=77f2c9bb246e5d48240f3f869ae625cd9f77568f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_whowas.cpp b/src/cmd_whowas.cpp
index 10643680c..1531f6239 100644
--- a/src/cmd_whowas.cpp
+++ b/src/cmd_whowas.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
 #include "commands/cmd_whowas.h"
 
 WhoWasMaintainTimer * timer;
@@ -157,16 +155,18 @@ void cmd_whowas::AddToWhoWas(userrec* user)
 			if (iter != whowas.end())
 			{
 				whowas_set* n = (whowas_set*)iter->second;
+
 				if (n->size())
 				{
 					while (n->begin() != n->end())
 					{
 						WhoWasGroup *a = *(n->begin());
-						DELETE(a);
+						delete a;
 						n->pop_front();
 					}
 				}
-				DELETE(n);
+
+				delete n;
 				whowas.erase(iter);
 			}
 			whowas_fifo.pop_front();
@@ -181,7 +181,7 @@ void cmd_whowas::AddToWhoWas(userrec* user)
 		if ((int)(group->size()) > ServerInstance->Config->WhoWasGroupSize)
 		{
 			WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
-			DELETE(a);
+			delete a;
 			group->pop_front();
 		}
 	}
@@ -203,24 +203,28 @@ void cmd_whowas::PruneWhoWas(time_t t)
 		if (fifosize > maxgroups || whowas_fifo[0].first < t - maxkeep)
 		{
 			iter = whowas.find(whowas_fifo[0].second);
+
 			/* hopefully redundant integrity check, but added while debugging r6216 */
 			if (iter == whowas.end())
 			{
 				/* this should never happen, if it does maps are corrupt */
-				ServerInstance->Log(DEBUG, "BUG: Whowas maps got corrupted! (1)");
+				ServerInstance->Log(DEFAULT, "BUG: Whowas maps got corrupted! (1)");
 				return;
 			}
+
 			whowas_set* n = (whowas_set*)iter->second;
+
 			if (n->size())
 			{
 				while (n->begin() != n->end())
 				{
 					WhoWasGroup *a = *(n->begin());
-					DELETE(a);
+					delete a;
 					n->pop_front();
 				}
 			}
-			DELETE(n);
+
+			delete n;
 			whowas.erase(iter);
 			whowas_fifo.pop_front();
 		}
@@ -237,7 +241,7 @@ void cmd_whowas::PruneWhoWas(time_t t)
 		if (iter == whowas.end())
 		{
 			/* this should never happen, if it does maps are corrupt */
-			ServerInstance->Log(DEBUG, "BUG: Whowas maps got corrupted! (2)");
+			ServerInstance->Log(DEFAULT, "BUG: Whowas maps got corrupted! (2)");
 			return;
 		}
 		whowas_set* n = (whowas_set*)iter->second;
@@ -247,7 +251,7 @@ void cmd_whowas::PruneWhoWas(time_t t)
 			while (n->begin() != n->end() && nickcount > groupsize)
 			{
 				WhoWasGroup *a = *(n->begin());
-				DELETE(a);
+				delete a;
 				n->pop_front();
 				nickcount--;
 			}
@@ -266,7 +270,7 @@ void cmd_whowas::MaintainWhoWas(time_t t)
 			while ((n->begin() != n->end()) && ((*n->begin())->signon < t - ServerInstance->Config->WhoWasMaxKeep))
 			{
 				WhoWasGroup *a = *(n->begin());
-				DELETE(a);
+				delete a;
 				n->erase(n->begin());
 			}
 		}
@@ -285,24 +289,28 @@ cmd_whowas::~cmd_whowas()
 	while ((fifosize = (int)whowas_fifo.size()) > 0)
 	{
 		iter = whowas.find(whowas_fifo[0].second);
+
 		/* hopefully redundant integrity check, but added while debugging r6216 */
 		if (iter == whowas.end())
 		{
 			/* this should never happen, if it does maps are corrupt */
-			ServerInstance->Log(DEBUG, "BUG: Whowas maps got corrupted! (3)");
+			ServerInstance->Log(DEFAULT, "BUG: Whowas maps got corrupted! (3)");
 			return;
 		}
+
 		whowas_set* n = (whowas_set*)iter->second;
+
 		if (n->size())
 		{
 			while (n->begin() != n->end())
 			{
 				WhoWasGroup *a = *(n->begin());
-				DELETE(a);
+				delete a;
 				n->pop_front();
 			}
 		}
-		DELETE(n);
+
+		delete n;
 		whowas.erase(iter);
 		whowas_fifo.pop_front();
 	}