This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 014/238] Fix Wshadow
- From: Andrey Smirnov <andrew dot smirnov at gmail dot com>
- To: gdb-patches at sourceware dot org
- Cc: brobecker at adacore dot com
- Date: Sun, 27 Nov 2011 20:19:23 +0700
- Subject: [PATCH 014/238] Fix Wshadow
I took the liberty of changing that name to, since it used similar `_flag'
ending.
---
gdb/ChangeLog | 5 +++++
gdb/ada-lang.c | 8 ++++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5f0c669..f0dca1d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+ * ada-lang.c (remove_extra_symbols): Rename `remove' to
+ `remove_p'(-Wshadow).
+
+2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
+
* ada-lang.c (ada_add_local_symbols): Fix -Wshadow warnings.
2011-11-19 Andrey Smirnov <andrew.smirnov@gmail.com>
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 0fd81b4..9cfd5c4 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];
--
1.7.5.4