[commit 04/12] Rename "wild_match" parameter in ada-lang.c:ada_add_local_symbols

[Joel Brobecker <brobecker at adacore dot com>]

... to avoid -Wshadow warning...

gdb/ChangeLog:

        -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.
---
 gdb/ChangeLog  |    8 ++++++++
 gdb/ada-lang.c |    9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 43d692b..f11feae 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,6 +2,14 @@
 	    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.
+
+2012-03-29  Joel Brobecker  <brobecker@adacore.com>
+	    Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+	-Wshadow warning fix.
 	* ada-lang.c (add_symbols_from_enclosing_procs): Rename
 	"wild_match" parameter to "wild_match_p" (-Wshadow).
 
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index facf44a..3aa6b5d 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -4882,20 +4882,23 @@ remove_irrelevant_renamings (struct ada_symbol_info *syms,
    If no match was found, then extend the search to "enclosing"
    routines (in other words, if we're inside a nested function,
    search the symbols defined inside the enclosing functions).
+   If WILD_MATCH_P is nonzero, perform the naming matching in
+   "wild" mode (see function "wild_match" for more info).
 
    Note: This function assumes that OBSTACKP has 0 (zero) element in it.  */
 
 static void
 ada_add_local_symbols (struct obstack *obstackp, const char *name,
                        struct block *block, domain_enum domain,
-                       int wild_match)
+                       int wild_match_p)
 {
   int block_depth = 0;
 
   while (block != NULL)
     {
       block_depth += 1;
-      ada_add_block_symbols (obstackp, block, name, domain, NULL, wild_match);
+      ada_add_block_symbols (obstackp, block, name, domain, NULL,
+			     wild_match_p);
 
       /* If we found a non-function match, assume that's the one.  */
       if (is_nonfunction (defns_collected (obstackp, 0),
@@ -4908,7 +4911,7 @@ ada_add_local_symbols (struct obstack *obstackp, const char *name,
   /* If no luck so far, try to find NAME as a local symbol in some lexically
      enclosing subprogram.  */
   if (num_defns_collected (obstackp) == 0 && block_depth > 2)
-    add_symbols_from_enclosing_procs (obstackp, name, domain, wild_match);
+    add_symbols_from_enclosing_procs (obstackp, name, domain, wild_match_p);
 }
 
 /* An object of this type is used as the user_data argument when
-- 
1.7.1