[gnugo-devel] shadowing in dragon.c

[Teun Burgers]

This patch fixes compilation warnings in dragon.c
generated by -Wshadow. Variable d was used
both as struct dragon_data * and int which
may be confusing. Other variables (str, k, d, dr) were
declared both at the top-level and within braces

Teun

Index: dragon.c
===================================================================
RCS file: /cvsroot/gnugo/gnugo/engine/dragon.c,v
retrieving revision 1.60
diff -u -r1.60 dragon.c
--- dragon.c    7 Apr 2002 15:09:51 -0000       1.60
+++ dragon.c    8 Apr 2002 20:29:06 -0000
@@ -201,13 +201,13 @@
       str = POS(i, j);
 
       if (black_eye[str].dragon != NO_MOVE) {
-       int dr = dragon[black_eye[str].dragon].origin;
+       dr = dragon[black_eye[str].dragon].origin;
        black_eye[str].dragon = dr;
       }
 
       if (white_eye[str].dragon != NO_MOVE) {
-       int dr = dragon[white_eye[str].dragon].origin;
-         white_eye[str].dragon = dr;
+       dr = dragon[white_eye[str].dragon].origin;
+       white_eye[str].dragon = dr;
       }
     }
   time_report(2, "  time to fix origins", NO_MOVE, 1.0);
@@ -306,7 +306,7 @@
   /* Now we compute the genus. */
   for (i = 0; i < board_size; i++)
     for (j = 0; j < board_size; j++) {
-      int str = POS(i, j);
+      str = POS(i, j);
 
       if (black_eye[str].color == BLACK_BORDER
          && black_eye[str].dragon != NO_MOVE
@@ -384,9 +384,9 @@
    */
   for (str = BOARDMIN; str < BOARDMAX; str++)
     if (ON_BOARD(str)) {
-      struct dragon_data *d = &(dragon[str]);
+      struct dragon_data *dd = &(dragon[str]);
       
-      dragon[str] = dragon[d->origin];
+      dragon[str] = dragon[dd->origin];
     }
   
   find_neighbor_dragons();
@@ -507,8 +507,8 @@
    */
   for (str = BOARDMIN; str < BOARDMAX; str++)
     if (ON_BOARD(str)) {
-      struct dragon_data *d = &(dragon[str]);
-      dragon[str] = dragon[d->origin];
+      struct dragon_data *dd = &(dragon[str]);
+      dragon[str] = dragon[dd->origin];
     }
 
   /* If the opponent's last move is a dead dragon, this is
@@ -583,8 +583,8 @@
    */
   for (str = BOARDMIN; str < BOARDMAX; str++)
     if (ON_BOARD(str)) {
-      struct dragon_data *d = &(dragon[str]);
-      dragon[str] = dragon[d->origin];
+      struct dragon_data *dd = &(dragon[str]);
+      dragon[str] = dragon[dd->origin];
     }
 
   time_report(2, "  owl threats ", NO_MOVE, 1.0);
@@ -1170,34 +1170,33 @@
     
   gprintf("%o\n");
   for (pos = BOARDMIN; pos < BOARDMAX; pos++) {
-    struct dragon_data *d = &(dragon[pos]);
+    struct dragon_data *dd = &(dragon[pos]);
     struct dragon_data2 *d2;
-    int k;
     
     if (!IS_STONE(board[pos]))
       continue;
     
-    d2 = &(dragon2[d->id]);
+    d2 = &(dragon2[dd->id]);
     
-    if (d->origin == pos) {
+    if (dd->origin == pos) {
       gprintf("%1m : %s dragon size %d (%f), genus %d, half eyes %d, escape 
factor %d, status %s, matcher status %s, moyo size %d safety %s",
              pos,
              board[pos] == BLACK ? "B" : "W",
-             d->size,
-             d->effective_size,
+             dd->size,
+             dd->effective_size,
              d2->genus,
              d2->heyes,
              d2->escape_route,
-             snames[d->status],
-             snames[d->matcher_status],
+             snames[dd->status],
+             snames[dd->matcher_status],
              d2->moyo,
              safety_names[d2->safety]);
-      gprintf(", owl status %s\n", snames[d->owl_status]);
-      if (d->owl_status == CRITICAL) {
+      gprintf(", owl status %s\n", snames[dd->owl_status]);
+      if (dd->owl_status == CRITICAL) {
        gprintf("... owl attackable at %1m, code %d\n",
-               d->owl_attack_point, d->owl_attack_code);
+               dd->owl_attack_point, dd->owl_attack_code);
        gprintf("... owl defendable at %1m, code %d\n",
-               d->owl_defense_point, d->owl_defense_code);
+               dd->owl_defense_point, dd->owl_defense_code);
       }
       gprintf("... neighbors");
       for (k = 0; k < d2->neighbors; k++) {