Fix warnings, unused and shadowed variables

diff --git a/src/end.c b/src/end.c
index 42acca2bad520ffbae165338ba59e42793710f67..f7ef12a02a24f38d4c6fa956aad62c87ffb175c8 100644 (file)
--- 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 8f45155519ee93c2c4c50e36b34fdccd90344d94..778d992890c5ab9c28e74e4e2e39da8bec8da126 100644 (file)
--- 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 3d2cc99333200780ecd2f6d26ee6c1187fe29d4e..42851c0dfc161f5a316b6c97ff14dea5ec13c19f 100644 (file)
--- 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 ff8bcff257f8e453a46e7b4ad6b9c2311950d2b8..604d224c6b2eac4a28adfa3cfef5fe89743f78cb 100644 (file)
--- 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 */