From e701b3c0f9fe487f85f4537de3133c34f58c8990 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 29 Mar 2012 23:30:21 +0000 Subject: [PATCH] Rename "wild_match" parameter in ada-lang.c:symbol_completion_match gdb/ChangeLog: -Wshadow warning fix. * ada-lang.c (symbol_completion_match): Rename parameter "wild_match" into "wild_match_p". Adjust code and function documentation accordingly. --- gdb/ChangeLog | 8 ++++++++ gdb/ada-lang.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2175494..91052a0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,14 @@ Andrey Smirnov -Wshadow warning fix. + * ada-lang.c (symbol_completion_match): Rename parameter + "wild_match" into "wild_match_p". Adjust code and function + documentation accordingly. + +2012-03-29 Joel Brobecker + Andrey Smirnov + + -Wshadow warning fix. * ada-lang.c (ada_lookup_encoded_symbol): Rename parameter "symbol_info" into "info". Adjust code accordingly. (ada_lookup_symbol): Likewise. diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index a7148ac..f68207b 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5640,14 +5640,14 @@ ada_add_block_symbols (struct obstack *obstackp, does not need to be deallocated, but is only good until the next call. TEXT_LEN is equal to the length of TEXT. - Perform a wild match if WILD_MATCH is set. + Perform a wild match if WILD_MATCH_P is set. ENCODED should be set if TEXT represents the start of a symbol name in its encoded form. */ static const char * symbol_completion_match (const char *sym_name, const char *text, int text_len, - int wild_match, int encoded) + int wild_match_p, int encoded) { const int verbatim_match = (text[0] == '<'); int match = 0; @@ -5695,7 +5695,7 @@ symbol_completion_match (const char *sym_name, /* Second: Try wild matching... */ - if (!match && wild_match) + if (!match && wild_match_p) { /* Since we are doing wild matching, this means that TEXT may represent an unqualified symbol name. We therefore must -- 2.7.4