From 4cd33b4290c0a4c5012877e874a39ebbc68fd7f8 Mon Sep 17 00:00:00 2001
From: rburchell <rburchell@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Tue, 18 Nov 2008 19:24:03 +0000
Subject: [PATCH] Fix various shadowed warnings in db-merger, db-merger is
 about to become the basis for db-convert, because I'm lazy.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1753 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/tools/db-merger.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/tools/db-merger.c b/src/tools/db-merger.c
index dae44d74b..c141e8382 100644
--- a/src/tools/db-merger.c
+++ b/src/tools/db-merger.c
@@ -316,8 +316,6 @@ int nonick = 0, nochan = 0, nobot = 0, nohost = 0;
 int main(int argc, char *argv[])
 {
 	dbFILE *f;
-	int i;
-	NickCore *nc, *ncnext;
 	HostCore *firsthc = NULL;
 
 	printf("\n"C_LBLUE"DB Merger v0.4 beta for Anope IRC Services by Certus"C_NONE"\n\n");
@@ -523,7 +521,7 @@ int main(int argc, char *argv[])
 			/* Nick aliases */
 			for (i = 0; i < 1024; i++) {
 				char *s = NULL;
-				NickAlias *ptr, *prev, *naptr;
+				NickAlias *ptr, *prev;
 
 				while ((c = getc_db(f)) == 1) {
 					if (c != 1) {
@@ -626,9 +624,10 @@ int main(int argc, char *argv[])
 	}
 
 	/* CLEAN THE CORES */
-
+	int i;
 	for (i = 0; i < 1024; i++) {
-		for (nc = nclists[i]; nc; nc = ncnext) {
+		NickCore *ncnext;
+		for (NickCore *nc = nclists[i]; nc; nc = ncnext) {
 			ncnext = nc->next;
 			if (nc->aliascount < 1) {
 				printf("Deleting core %s (%s).\n", nc->display, nc->email); 
@@ -645,7 +644,7 @@ int main(int argc, char *argv[])
 			NickCore *nc;
 			char **access;
 			Memo *memos;
-			int i, j;
+			int j;
 
 			/* Nick cores */
 			for (i = 0; i < 1024; i++) {
@@ -714,9 +713,6 @@ int main(int argc, char *argv[])
 			int n_levels;
 			char *s;
 			int n_ttb;
-			/* Unused variable - why? -GD
-			int J;
-			*/
 
 			last = &chanlists[i];
 			prev = NULL;
@@ -1111,7 +1107,6 @@ int main(int argc, char *argv[])
 						}
 						if (input[0] == '1') { /* #2 isn't in the list yet, #1 is. -> free() #2 [ci] */
 							NickCore *nc = NULL;
-							int i;
 							printf("Deleting chan %s (#2).\n", ci->name);
 
 							if (ci->founder) {