Fix -Wshadow error in ada-valprint.c

gdb/ChangeLog:

        * ada-valprint.c (ada_val_print_1): Move the code handling
        TYPE_CODE_ENUM inside its own lexical block.  Declare
        variables len and val there, instead of in the function's
        top level block.  Avoid declaring deref_val again in a way
        that shadows another variable of the same name declared
        in one of the up-level blocks.  Just re-use the up-level
        variable instead.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0c50bc8..97aba93 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,15 @@
 2012-03-29  Joel Brobecker  <brobecker@adacore.com>
+           Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+       * ada-valprint.c (ada_val_print_1): Move the code handling
+       TYPE_CODE_ENUM inside its own lexical block.  Declare
+       variables len and val there, instead of in the function's
+       top level block.  Avoid declaring deref_val again in a way
+       that shadows another variable of the same name declared
+       in one of the up-level blocks.  Just re-use the up-level
+       variable instead.
+
+2012-03-29  Joel Brobecker  <brobecker@adacore.com>
 
        * ada-lang.c (ada_lookup_encoded_symbol): Now returns void.
        Replace block_found argument by symbol_info.  Adjust

diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index a8351dd..1ec62ce 100644 (file)
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -659,10 +659,8 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
                 const struct value *original_value,
                 const struct value_print_options *options)
 {
-  unsigned int len;
   int i;
   struct type *elttype;
-  LONGEST val;
   int offset_aligned;
 
   type = ada_check_typedef (type);
@@ -811,36 +809,41 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
        }
 
     case TYPE_CODE_ENUM:
-      if (options->format)
-       {
-         val_print_scalar_formatted (type, valaddr, offset_aligned,
-                                     original_value, options, 0, stream);
-         break;
-       }
-      len = TYPE_NFIELDS (type);
-      val = unpack_long (type, valaddr + offset_aligned);
-      for (i = 0; i < len; i++)
-       {
-         QUIT;
-         if (val == TYPE_FIELD_BITPOS (type, i))
-           {
-             break;
-           }
-       }
-      if (i < len)
-       {
-         const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i));
+      {
+       unsigned int len;
+       LONGEST val;
 
-         if (name[0] == '\'')
-           fprintf_filtered (stream, "%ld %s", (long) val, name);
-         else
-           fputs_filtered (name, stream);
-       }
-      else
-       {
-         print_longest (stream, 'd', 0, val);
-       }
-      break;
+       if (options->format)
+         {
+           val_print_scalar_formatted (type, valaddr, offset_aligned,
+                                       original_value, options, 0, stream);
+           break;
+         }
+       len = TYPE_NFIELDS (type);
+       val = unpack_long (type, valaddr + offset_aligned);
+       for (i = 0; i < len; i++)
+         {
+           QUIT;
+           if (val == TYPE_FIELD_BITPOS (type, i))
+             {
+               break;
+             }
+         }
+       if (i < len)
+         {
+           const char *name = ada_enum_name (TYPE_FIELD_NAME (type, i));
+
+           if (name[0] == '\'')
+             fprintf_filtered (stream, "%ld %s", (long) val, name);
+           else
+             fputs_filtered (name, stream);
+         }
+       else
+         {
+           print_longest (stream, 'd', 0, val);
+         }
+       break;
+      }
 
     case TYPE_CODE_FLT:
       if (options->format)
@@ -897,7 +900,7 @@ ada_val_print_1 (struct type *type, const gdb_byte *valaddr,
           deref_val_int = unpack_pointer (type, valaddr + offset_aligned);
           if (deref_val_int != 0)
             {
-              struct value *deref_val =
+              deref_val =
                 ada_value_ind (value_from_pointer
                                (lookup_pointer_type (elttype),
                                 deref_val_int));