[gnugo-devel] -Wshadow fixes for 3.3.2

[Teun Burgers]

This patch fixes some more -Wshadow warnings.
The regression results are not influenced by
this patch.

- fix shadowing warnings in reading.c, owl.c, utils.c
  readconnect.c, aftermath.c, value_moves.c, worm.c

Teun

Index: aftermath.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/aftermath.c,v
retrieving revision 1.27
diff -u -r1.27 aftermath.c
--- aftermath.c 26 Apr 2002 18:58:41 -0000      1.27
+++ aftermath.c 28 Apr 2002 11:13:09 -0000
@@ -256,9 +256,9 @@
                  && libs == countlib(pos + dir)))
          && (DRAGON2(pos + dir).safety == INVINCIBLE
              || DRAGON2(pos + dir).safety == STRONGLY_ALIVE)) {
-       int score = 20 * (owl_hotspot[pos] + reading_hotspot[pos]);
-       if (score > best_score) {
-         best_score = score;
+       int this_score = 20 * (owl_hotspot[pos] + reading_hotspot[pos]);
+       if (this_score > best_score) {
+         best_score = this_score;
          best_scoring_move = pos;
        }
       }
@@ -465,14 +465,14 @@
            int important = 0;
            int safe_atari = 0;
            for (r = 0; r < 4; r++) {
-             int d = delta[r];
-             if (!ON_BOARD(apos+d))
+             int dlt = delta[r];
+             if (!ON_BOARD(apos+dlt))
                continue;
-             if (board[apos+d] == other
-                 && dragon[apos+d].matcher_status == DEAD)
+             if (board[apos+dlt] == other
+                 && dragon[apos+dlt].matcher_status == DEAD)
                important = 1;
-             else if (board[apos+d] == EMPTY
-                      && !is_self_atari(apos+d, other))
+             else if (board[apos+dlt] == EMPTY
+                      && !is_self_atari(apos+dlt, other))
                safe_atari = 1;
            }
            if (approxlib(pos, color, 3, NULL) > 2) {
@@ -620,7 +620,6 @@
    * dragons, carefully checking against mistakes.
    */
   for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    int move;
     int target;
     int cc = NO_MOVE;
     int self_atari_ok = 0;
Index: optics.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/optics.c,v
retrieving revision 1.41
diff -u -r1.41 optics.c
--- optics.c    18 Apr 2002 21:21:31 -0000      1.41
+++ optics.c    28 Apr 2002 11:13:12 -0000
@@ -394,7 +394,6 @@
   } while (found_one);
   
   if (0 && (debug & DEBUG_EYES)) {
-    int i, j;
     start_draw_board();
     for (i = 0; i < board_size; i++)
       for (j = 0; j < board_size; j++) {
Index: owl.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/owl.c,v
retrieving revision 1.84
diff -u -r1.84 owl.c
--- owl.c       25 Apr 2002 18:06:10 -0000      1.84
+++ owl.c       28 Apr 2002 11:13:28 -0000
@@ -2346,7 +2346,6 @@
     owl_find_lunches(owl);
   
   if (0) {
-    int k;
     for (k = 0; k < MAX_LUNCHES; k++)
       if (owl->lunch[k] != NO_MOVE)
        gprintf("owl lunch %1m, attack %1m, defend %1m\n",
@@ -2447,7 +2446,6 @@
              * been examined.
             */
            if (!previously_marginal) {
-             int k;
              for (k = 4; k < 8; k++) {
                int i = m + deltai[k];
                int j = n + deltaj[k];
@@ -3281,7 +3279,6 @@
    */
   for (pos = BOARDMIN; pos < BOARDMAX; pos++)
     if (board[pos] == other && owl->boundary[pos] == 0) {
-      int k;
       /* If a lunch has been amalgamated into a larger dragon, we
        * have to back out now.
        *
Index: readconnect.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/readconnect.c,v
retrieving revision 1.32
diff -u -r1.32 readconnect.c
--- readconnect.c       15 Apr 2002 17:40:01 -0000      1.32
+++ readconnect.c       28 Apr 2002 11:13:36 -0000
@@ -716,9 +716,9 @@
   int adjadj, adjadjs[MAXCHAIN];
   int move;
   int k;
+  int pos;
   int secondlib1[BOARDMAX];
   int secondlib2[BOARDMAX];
-  int pos;
   
   if (moves_to_connect_in_two_moves(moves, str1, str2))
     return 1;
@@ -728,7 +728,7 @@
   liberties = findlib(str1, MAXLIBS, libs);
   for (r = 0; r < liberties; r++)
     for (k = 0; k < 4; k++) {
-      int pos = libs[r] + delta[k];
+      pos = libs[r] + delta[k];
       if (board[pos] == EMPTY)
        secondlib1[pos] = 1;
       else if (board[pos] == board[str1]) {
@@ -744,7 +744,7 @@
   liberties = findlib(str2, MAXLIBS, libs);
   for (r = 0; r < liberties; r++)
     for (k = 0; k < 4; k++) {
-      int pos = libs[r] + delta[k];
+      pos = libs[r] + delta[k];
       if (board[pos] == EMPTY)
        secondlib2[pos] = 1;
       else if (board[pos] == board[str2]) {
Index: reading.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/reading.c,v
retrieving revision 1.59
diff -u -r1.59 reading.c
--- reading.c   19 Apr 2002 17:13:25 -0000      1.59
+++ reading.c   28 Apr 2002 11:13:51 -0000
@@ -3841,13 +3841,13 @@
    * super_string.
    */
   if (level >= 10 && stackp <= backfill2_depth) {
-    int liberties;
-    int libs[MAX_LIBERTIES + 4];
+    int ss_liberties;
+    int ss_libs[MAX_LIBERTIES + 4];
 
-    find_superstring_liberties(str, &liberties, libs, 3);
-    if (liberties <= 5) {
-      for (k = 0; k < liberties; k++) {
-       int apos = libs[k];
+    find_superstring_liberties(str, &ss_liberties, ss_libs, 3);
+    if (ss_liberties <= 5) {
+      for (k = 0; k < ss_liberties; k++) {
+       int apos = ss_libs[k];
        
        if (liberty_of_string(apos, str))
          continue;
Index: utils.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/utils.c,v
retrieving revision 1.44
diff -u -r1.44 utils.c
--- utils.c     13 Apr 2002 18:11:00 -0000      1.44
+++ utils.c     28 Apr 2002 11:13:54 -0000
@@ -1598,10 +1598,10 @@
            int lunch_stones[MAX_BOARD*MAX_BOARD];
            int num_lunch_stones = findstones(upos, MAX_BOARD*MAX_BOARD,
                                              lunch_stones);
-           int r, s;
-           for (r = 0; r < num_lunch_stones; r++)
-             for (s = 0; s < 8; s++) {
-               int vpos = lunch_stones[r] + delta[s];
+           int m, n;
+           for (m = 0; m < num_lunch_stones; m++)
+             for (n = 0; n < 8; n++) {
+               int vpos = lunch_stones[m] + delta[n];
                if (board[vpos] == color && !mx[vpos])
                  superstring_add_string(vpos,
                                         &num_my_stones, my_stones,
Index: value_moves.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/value_moves.c,v
retrieving revision 1.29
diff -u -r1.29 value_moves.c
--- value_moves.c       27 Apr 2002 22:08:58 -0000      1.29
+++ value_moves.c       28 Apr 2002 11:14:03 -0000
@@ -669,8 +669,8 @@
            int aa = NO_MOVE;
            int bb = NO_MOVE;
            int size;
+           int m;
            int our_color_neighbors;
-           int k;
            
            if (type == ATTACK_MOVE
                || type == ATTACK_MOVE_GOOD_KO
@@ -708,20 +708,20 @@
              int num_adj, adjs[MAXCHAIN];
 
              num_adj = chainlinks(aa, adjs);
-             for (k = 0; k < num_adj; k++) {
-               int adj = adjs[k];
+             for (m = 0; m < num_adj; m++) {
+               int adj = adjs[m];
 
                if (board[adj] == color) {
                  /* Check whether this string is part of the same
                    * dragon as an earlier string. We only want to
                    * count distinct neighbor dragons.
                   */
-                 int l;
+                 int n;
 
-                 for (l = 0; l < k; l++)
-                   if (dragon[adjs[l]].id == dragon[adj].id)
+                 for (n = 0; n < m; n++)
+                   if (dragon[adjs[n]].id == dragon[adj].id)
                      break;
-                 if (l == k) {
+                 if (n == m) {
                    /* New dragon. */
                    our_color_neighbors++;
                    bb = adj;
@@ -730,10 +730,10 @@
              }
            }
            else {
-             for (k = 0; k < DRAGON2(aa).neighbors; k++)
-               if (DRAGON(DRAGON2(aa).adjacent[k]).color == color) {
+             for (m = 0; m < DRAGON2(aa).neighbors; m++)
+               if (DRAGON(DRAGON2(aa).adjacent[m]).color == color) {
                  our_color_neighbors++;
-                 bb = dragon2[DRAGON2(aa).adjacent[k]].origin;
+                 bb = dragon2[DRAGON2(aa).adjacent[m]].origin;
                  if (dragon[bb].matcher_status == ALIVE) {
                    tactical_safety = 1;
                    safety = 1;
Index: worm.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/worm.c,v
retrieving revision 1.36
diff -u -r1.36 worm.c
--- worm.c      11 Apr 2002 18:41:45 -0000      1.36
+++ worm.c      28 Apr 2002 11:14:08 -0000
@@ -878,7 +878,6 @@
    */
   {
     static int libs[MAXLIBS];
-    int k;
     int color;
     int other;
     int liberties;