From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 10 Apr 2015 17:55:24 +0000 (+0300)
Subject: Fix warnings, unused and shadowed variables
X-Git-Tag: NetHack-3.6.0_RC01~414^2~41^2~8^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cc1b5de2a85eabb7e04995ad90beb3ac026e86b8;p=nethack

Fix warnings, unused and shadowed variables
---

diff --git a/src/end.c b/src/end.c
index 42acca2ba..f7ef12a02 100644
--- a/src/end.c
+++ b/src/end.c
@@ -1238,7 +1238,7 @@ boolean identified, all_containers, reportempty;
 {
 	register struct obj *box, *obj;
 	struct obj **oarray;
-	int i,j,n;
+	int i,n;
 	char *invlet;
 	char buf[BUFSZ];
 	boolean cat, deadcat;
diff --git a/src/invent.c b/src/invent.c
index 8f4515551..778d99289 100644
--- a/src/invent.c
+++ b/src/invent.c
@@ -1800,13 +1800,12 @@ long* out_cnt;
 	struct obj *otmp;
 	char ilet, ret;
 	char *invlet = flags.inv_order;
-	int n, classcount;
+	int i, n, classcount;
 	winid win;				/* windows being used */
 	static winid local_win = WIN_ERR;	/* window for partial menus */
 	anything any;
 	menu_item *selected;
 	struct obj **oarray;
-	int i, j;
 
 	/* overriden by global flag */
 	if (flags.perm_invent) {
diff --git a/src/mkmaze.c b/src/mkmaze.c
index 3d2cc9933..42851c0df 100644
--- a/src/mkmaze.c
+++ b/src/mkmaze.c
@@ -879,7 +879,6 @@ fumaroles()
     for (n = rn2(3)+2; n; n--) {
 	xchar x = rn1(COLNO-4,3);
 	xchar y = rn1(ROWNO-4,3);
-	struct trap *ttmp = t_at(x,y);
 	if (levl[x][y].typ == LAVAPOOL) {
 	    NhRegion *r = create_gas_cloud(x,y, 4+rn2(5), rn1(10,5));
 	    clear_heros_fault(r);
diff --git a/src/pickup.c b/src/pickup.c
index ff8bcff25..604d224c6 100644
--- a/src/pickup.c
+++ b/src/pickup.c
@@ -708,7 +708,7 @@ menu_item **pick_list;		/* return list of items picked */
 int how;			/* type of query */
 boolean FDECL((*allow), (OBJ_P));/* allow function */
 {
-	int i, j, n;
+	int i, n;
 	winid win;
 	struct obj *curr, *last, fake_hero_object;
 	struct obj **oarray;
@@ -823,7 +823,7 @@ boolean FDECL((*allow), (OBJ_P));/* allow function */
 
 	if (n > 0) {
 	    menu_item *mi;
-	    int i, k;
+	    int k;
 
 	    /* fix up counts:  -1 means no count used => pick all;
 	       if fake_hero_object was picked, discard that choice */