diff options
| author | Joel Brobecker <brobecker@gnat.com> | 2012-03-29 23:29:55 +0000 |
|---|---|---|
| committer | Joel Brobecker <brobecker@gnat.com> | 2012-03-29 23:29:55 +0000 |
| commit | d87ba317232961fe0e6d30858220c930a11a53b0 (patch) | |
| tree | 058b886ed523e34eb67dd7268b1227f4ee6bf3e1 /gdb | |
| parent | 8f389cfa3c9c83ee6cad4c2dd2daf63f5c9951c4 (diff) | |
| download | gdb-d87ba317232961fe0e6d30858220c930a11a53b0.tar.gz | |
Rename "wild_match" variable in ada-lang.c:ada_lookup_symbol_list
... to avoid -Wshadow warning...
gdb/ChangeLog:
-Wshadow warning fix.
* ada-lang.c (ada_lookup_symbol_list): Rename "wild_match"
variable into "wild_match_p". Adjust code accordingly.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/ada-lang.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f11feae06a7..5fa637cdb20 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,13 @@ Andrey Smirnov <andrew.smirnov@gmail.com> -Wshadow warning fix. + * ada-lang.c (ada_lookup_symbol_list): Rename "wild_match" + variable into "wild_match_p". Adjust code accordingly. + +2012-03-29 Joel Brobecker <brobecker@adacore.com> + Andrey Smirnov <andrew.smirnov@gmail.com> + + -Wshadow warning fix. * ada-lang.c (ada_add_local_symbols): Rename "wild_match" parameter into "wild_match_p". Adjust code accordingly. Document this parameter in the function description. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 3aa6b5dbdfb..b14c266962c 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5073,7 +5073,7 @@ ada_lookup_symbol_list (const char *name0, const struct block *block0, struct symbol *sym; struct block *block; const char *name; - const int wild_match = should_use_wild_match (name0); + const int wild_match_p = should_use_wild_match (name0); int cacheIfUnique; int ndefns; @@ -5105,7 +5105,7 @@ ada_lookup_symbol_list (const char *name0, const struct block *block0, /* Check the non-global symbols. If we have ANY match, then we're done. */ ada_add_local_symbols (&symbol_list_obstack, name, block, namespace, - wild_match); + wild_match_p); if (num_defns_collected (&symbol_list_obstack) > 0 || !full_search) goto done; @@ -5124,14 +5124,14 @@ ada_lookup_symbol_list (const char *name0, const struct block *block0, /* Search symbols from all global blocks. */ add_nonlocal_symbols (&symbol_list_obstack, name, namespace, 1, - wild_match); + wild_match_p); /* Now add symbols from all per-file blocks if we've gotten no hits (not strictly correct, but perhaps better than an error). */ if (num_defns_collected (&symbol_list_obstack) == 0) add_nonlocal_symbols (&symbol_list_obstack, name, namespace, 0, - wild_match); + wild_match_p); done: ndefns = num_defns_collected (&symbol_list_obstack); |