2011-03-01 Michael Snyder <msnyder@vmware.com>

	* ada-lang.c (aggregate_assign_others): Rename inner scope variable
	which shadows function parameter.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 65b960360cea305b29d245258fc5c20229eb6d60..5be6deaeed7daa5c90c1da2e54433588a11d21bd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2011-03-01  Michael Snyder  <msnyder@vmware.com>
 
+       * ada-lang.c (aggregate_assign_others): Rename inner scope variable
+       which shadows function parameter.
+
        * tracepoint.c (create_tsv_from_upload): Superfluous call
        to xstrdup.  Callee already calls xstrdup.
 

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 467e4df80eedcc9d7cd4a1f0575deb80486c31b1..55b05f102e55ccdff1fbce31f98fb0b204d463dd 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -8717,7 +8717,7 @@ aggregate_assign_others (struct value *container,
                         LONGEST low, LONGEST high) 
 {
   int i;
-  int expr_pc = *pos+1;
+  int expr_pc = *pos + 1;
   
   for (i = 0; i < num_indices - 2; i += 2)
     {
@@ -8725,10 +8725,10 @@ aggregate_assign_others (struct value *container,
 
       for (ind = indices[i + 1] + 1; ind < indices[i + 2]; ind += 1)
        {
-         int pos;
+         int localpos;
 
-         pos = expr_pc;
-         assign_component (container, lhs, ind, exp, &pos);
+         localpos = expr_pc;
+         assign_component (container, lhs, ind, exp, &localpos);
        }
     }
   ada_evaluate_subexp (NULL, exp, pos, EVAL_SKIP);