Rename "wild_match" parameter in ada-lang.c:symbol_completion_add...

... to avoid a -Wshadow warning.

gdb/ChangeLog:

        -Wshadow warning fix.
        * ada-lang.c (symbol_completion_add): Rename parameter
        "wild_match" into wild_match_p.  Update code and documentation
        accordingly.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9a6e55df74261b300cef620dc1dfb57b464811d6..85efe726bd51ad81b30659f46268395cb5cb5beb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2012-03-29  Joel Brobecker  <brobecker@adacore.com>
+           Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+       -Wshadow warning fix.
+       * ada-lang.c (symbol_completion_add): Rename parameter
+       "wild_match" into wild_match_p.  Update code and documentation
+       accordingly.
+

 2012-03-29  Joel Brobecker  <brobecker@adacore.com>
 
        * ada-lang.c (symbol_completion_match): Rename parameter
 2012-03-29  Joel Brobecker  <brobecker@adacore.com>
 
        * ada-lang.c (symbol_completion_match): Rename parameter

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 64fb848d53ab8d31fa9f29785eb572fa645a6c95..092ee269a6d2bc981242e17ee5fd06bebf18aadf 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -5730,7 +5730,7 @@ symbol_completion_match (const char *sym_name,
    completion should be performed.  These two parameters are used to
    determine which part of the symbol name should be added to the
    completion vector.
    completion should be performed.  These two parameters are used to
    determine which part of the symbol name should be added to the
    completion vector.

-   if WILD_MATCH is set, then wild matching is performed.
+   if WILD_MATCH_P is set, then wild matching is performed.

    ENCODED should be set if TEXT represents a symbol name in its
    encoded formed (in which case the completion should also be
    encoded).  */
    ENCODED should be set if TEXT represents a symbol name in its
    encoded formed (in which case the completion should also be
    encoded).  */


@@ -5740,10 +5740,10 @@ symbol_completion_add (VEC(char_ptr) **sv,
                        const char *sym_name,
                        const char *text, int text_len,
                        const char *orig_text, const char *word,
                        const char *sym_name,
                        const char *text, int text_len,
                        const char *orig_text, const char *word,

-                       int wild_match, int encoded)
+                       int wild_match_p, int encoded)

 {
   const char *match = symbol_completion_match (sym_name, text, text_len,
 {
   const char *match = symbol_completion_match (sym_name, text, text_len,

-                                               wild_match, encoded);
+                                               wild_match_p, encoded);

   char *completion;
 
   if (match == NULL)
   char *completion;
 
   if (match == NULL)