From: Andrey Smirnov <ndreys@sourceware.org>
Date: Sun, 11 Dec 2011 02:31:04 +0000 (+0000)
Subject: * ada-lang.c (remove_extra_symbols): Rename `remove' to
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a35ddb4476da3a002ea623ad3e1ac72821f9f0be;p=binutils-gdb.git

* ada-lang.c (remove_extra_symbols): Rename `remove' to
`remove_p'(-Wshadow).
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4e3edce4c2c..d02a3dbd09c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-10  Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+	* ada-lang.c (remove_extra_symbols): Rename `remove' to
+	`remove_p'(-Wshadow).
+
 2011-12-10  Andrey Smirnov  <andrew.smirnov@gmail.com>
 
 	* ada-exp.y (write_var_or_type): Rename nested `renaming' to
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 3843539d260..d32d3161125 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4488,7 +4488,7 @@ remove_extra_symbols (struct ada_symbol_info *syms, int nsyms)
   i = 0;
   while (i < nsyms)
     {
-      int remove = 0;
+      int remove_p = 0;
 
       /* If two symbols have the same name and one of them is a stub type,
          the get rid of the stub.  */
@@ -4503,7 +4503,7 @@ remove_extra_symbols (struct ada_symbol_info *syms, int nsyms)
                   && SYMBOL_LINKAGE_NAME (syms[j].sym) != NULL
                   && strcmp (SYMBOL_LINKAGE_NAME (syms[i].sym),
                              SYMBOL_LINKAGE_NAME (syms[j].sym)) == 0)
-                remove = 1;
+                remove_p = 1;
             }
         }
 
@@ -4523,11 +4523,11 @@ remove_extra_symbols (struct ada_symbol_info *syms, int nsyms)
                   && SYMBOL_CLASS (syms[i].sym) == SYMBOL_CLASS (syms[j].sym)
                   && SYMBOL_VALUE_ADDRESS (syms[i].sym)
                   == SYMBOL_VALUE_ADDRESS (syms[j].sym))
-                remove = 1;
+                remove_p = 1;
             }
         }
       
-      if (remove)
+      if (remove_p)
         {
           for (j = i + 1; j < nsyms; j += 1)
             syms[j - 1] = syms[j];