From 5db1d322be106c8462dc691072f9415dc0766ed4 Mon Sep 17 00:00:00 2001
From: w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Mon, 11 Feb 2008 09:41:58 +0000
Subject: Add -Wshadow to cflags, and fix a bunch of warnings that come with
 it. Add a note to webirc that needs looking at.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8892 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/commands/cmd_nick.cpp   |  2 +-
 src/commands/cmd_whowas.cpp | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/commands')

diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp
index 25bf858c8..5a7ed846a 100644
--- a/src/commands/cmd_nick.cpp
+++ b/src/commands/cmd_nick.cpp
@@ -147,7 +147,7 @@ CmdResult CommandNick::Handle (const char** parameters, int, User *user)
 	else if (user->registered == REG_NICKUSER)
 	{
 		/* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */
-		int MOD_RESULT = 0;
+		MOD_RESULT = 0;
 		FOREACH_RESULT(I_OnUserRegister,OnUserRegister(user));
 		if (MOD_RESULT > 0)
 			return CMD_FAILURE;
diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
index b961bc839..7b44a0290 100644
--- a/src/commands/cmd_whowas.cpp
+++ b/src/commands/cmd_whowas.cpp
@@ -150,23 +150,23 @@ void CommandWhowas::AddToWhoWas(User* user)
 
 		if ((int)(whowas.size()) > ServerInstance->Config->WhoWasMaxGroups)
 		{
-			whowas_users::iterator iter = whowas.find(whowas_fifo[0].second);
-			if (iter != whowas.end())
+			whowas_users::iterator iter2 = whowas.find(whowas_fifo[0].second);
+			if (iter2 != whowas.end())
 			{
-				whowas_set* n = (whowas_set*)iter->second;
+				whowas_set* n2 = (whowas_set*)iter2->second;
 
-				if (n->size())
+				if (n2->size())
 				{
-					while (n->begin() != n->end())
+					while (n2->begin() != n2->end())
 					{
-						WhoWasGroup *a = *(n->begin());
-						delete a;
-						n->pop_front();
+						WhoWasGroup *a2 = *(n2->begin());
+						delete a2;
+						n2->pop_front();
 					}
 				}
 
-				delete n;
-				whowas.erase(iter);
+				delete n2;
+				whowas.erase(iter2);
 			}
 			whowas_fifo.pop_front();
 		}
@@ -179,8 +179,8 @@ void CommandWhowas::AddToWhoWas(User* user)
 
 		if ((int)(group->size()) > ServerInstance->Config->WhoWasGroupSize)
 		{
-			WhoWasGroup *a = (WhoWasGroup*)*(group->begin());
-			delete a;
+			WhoWasGroup *a2 = (WhoWasGroup*)*(group->begin());
+			delete a2;
 			group->pop_front();
 		}
 	}
-- 
cgit v1.2.3