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

`remove_p'(-Wshadow).
This commit is contained in:
Andrey Smirnov 2011-12-11 02:31:04 +00:00
parent e5e61bd728
commit a35ddb4476
2 changed files with 9 additions and 4 deletions

View file

@ -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> 2011-12-10 Andrey Smirnov <andrew.smirnov@gmail.com>
* ada-exp.y (write_var_or_type): Rename nested `renaming' to * ada-exp.y (write_var_or_type): Rename nested `renaming' to

View file

@ -4488,7 +4488,7 @@ remove_extra_symbols (struct ada_symbol_info *syms, int nsyms)
i = 0; i = 0;
while (i < nsyms) 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, /* If two symbols have the same name and one of them is a stub type,
the get rid of the stub. */ 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 && SYMBOL_LINKAGE_NAME (syms[j].sym) != NULL
&& strcmp (SYMBOL_LINKAGE_NAME (syms[i].sym), && strcmp (SYMBOL_LINKAGE_NAME (syms[i].sym),
SYMBOL_LINKAGE_NAME (syms[j].sym)) == 0) 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_CLASS (syms[i].sym) == SYMBOL_CLASS (syms[j].sym)
&& SYMBOL_VALUE_ADDRESS (syms[i].sym) && SYMBOL_VALUE_ADDRESS (syms[i].sym)
== SYMBOL_VALUE_ADDRESS (syms[j].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) for (j = i + 1; j < nsyms; j += 1)
syms[j - 1] = syms[j]; syms[j - 1] = syms[j];