From: Michael Snyder <msnyder@vmware.com>
Date: Tue, 1 Mar 2011 22:42:33 +0000 (+0000)
Subject: 2011-03-01  Michael Snyder  <msnyder@vmware.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ce6495039d4449a0770331ab29d3d2dfe8bae71;p=binutils-gdb.git

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 65b960360ce..5be6deaeed7 100644
--- 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 467e4df80ee..55b05f102e5 100644
--- 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);