diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2012-03-29 23:30:13 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2012-03-29 23:30:13 +0000 |
| commit | 5e2336be92602c141d5c834e63b2a263444bf91c (patch) | |
| tree | 79c8f36f8df776cf90d3c6037f1fa1cb6d422a3f /gdb | |
| parent | 9f88c95977623df8cdc14ece8c5d5a32be8ae178 (diff) | |
| download | gdb-5e2336be92602c141d5c834e63b2a263444bf91c.zip gdb-5e2336be92602c141d5c834e63b2a263444bf91c.tar.gz gdb-5e2336be92602c141d5c834e63b2a263444bf91c.tar.bz2 | |
rename "symbol_info" to "sym_info" in ada-lang.c...
... to avoid a -Wshadow warning with a symbol exported by BFD.
gdb/ChangeLog:
-Wshadow warning fix.
* ada-lang.c (ada_lookup_encoded_symbol): Rename parameter
"symbol_info" into "info". Adjust code accordingly.
(ada_lookup_symbol): Likewise.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c64d1b9..2175494 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,12 @@ 2012-03-29 Joel Brobecker <brobecker@adacore.com> + Andrey Smirnov <andrew.smirnov@gmail.com> + + -Wshadow warning fix. + * ada-lang.c (ada_lookup_encoded_symbol): Rename parameter + "symbol_info" into "info". Adjust code accordingly. + (ada_lookup_symbol): Likewise. + +2012-03-29 Joel Brobecker <brobecker@adacore.com> * ada-lang.c (ada_lookup_symbol_list): Minor reformatting of this function's documentation. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index c063683..a7148ac 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5198,19 +5198,19 @@ ada_iterate_over_symbols (const struct block *block, to 1, but choosing the first symbol found if there are multiple choices. - The result is stored in *SYMBOL_INFO, which must be non-NULL. - If no match is found, SYMBOL_INFO->SYM is set to NULL. */ + The result is stored in *INFO, which must be non-NULL. + If no match is found, INFO->SYM is set to NULL. */ void ada_lookup_encoded_symbol (const char *name, const struct block *block, domain_enum namespace, - struct ada_symbol_info *symbol_info) + struct ada_symbol_info *info) { struct ada_symbol_info *candidates; int n_candidates; - gdb_assert (symbol_info != NULL); - memset (symbol_info, 0, sizeof (struct ada_symbol_info)); + gdb_assert (info != NULL); + memset (info, 0, sizeof (struct ada_symbol_info)); n_candidates = ada_lookup_symbol_list (name, block, namespace, &candidates, 1); @@ -5218,8 +5218,8 @@ ada_lookup_encoded_symbol (const char *name, const struct block *block, if (n_candidates == 0) return; - *symbol_info = candidates[0]; - symbol_info->sym = fixup_symbol_section (symbol_info->sym, NULL); + *info = candidates[0]; + info->sym = fixup_symbol_section (info->sym, NULL); } /* Return a symbol in DOMAIN matching NAME, in BLOCK0 and enclosing @@ -5232,14 +5232,14 @@ struct symbol * ada_lookup_symbol (const char *name, const struct block *block0, domain_enum namespace, int *is_a_field_of_this) { - struct ada_symbol_info symbol_info; + struct ada_symbol_info info; if (is_a_field_of_this != NULL) *is_a_field_of_this = 0; ada_lookup_encoded_symbol (ada_encode (ada_fold_name (name)), - block0, namespace, &symbol_info); - return symbol_info.sym; + block0, namespace, &info); + return info.sym; } static struct symbol * |