OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename variables in ada-lang.c:ada_make_symbol_completion_list.

Browse Source 
This renaming allows us to have variable names that are consistent
with the names of the parameters in the functions where these
variables are used.  This also allows us to avoid a -Wshadow warning
in the case of variable "wild_match", which is now renamed to
"wild_match_p".

gdb/ChangeLog:

        -Wshadow warning fix.
        * ada-lang.c (ada_make_symbol_completion_list): Rename parameters
        "wild_match" and "encoded" into "wild_match_p" and "encoded_p".
        Adjust code accordingly.
This commit is contained in:
Joel Brobecker 2012-03-29 23:30:55 +00:00
parent cb8e9b977e
commit b1ed564ad0
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2012-03-29 Joel Brobecker <brobecker@adacore.com>
Andrey Smirnov <andrew.smirnov@gmail.com>
-Wshadow warning fix.
* ada-lang.c (ada_make_symbol_completion_list): Rename parameters
"wild_match" and "encoded" into "wild_match_p" and "encoded_p".
Adjust code accordingly.
2012-03-29 Joel Brobecker <brobecker@adacore.com> 2012-03-29 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (symbol_completion_add): Rename parameter * ada-lang.c (symbol_completion_add): Rename parameter

25
gdb/ada-lang.c
View File

@ -5807,8 +5807,8 @@ ada_make_symbol_completion_list (char *text0, char *word)
{ {
char *text; char *text;
int text_len; int text_len;
int wild_match; int wild_match_p;
int encoded; int encoded_p;
VEC(char_ptr) *completions = VEC_alloc (char_ptr, 128); VEC(char_ptr) *completions = VEC_alloc (char_ptr, 128);
struct symbol *sym; struct symbol *sym;
struct symtab *s; struct symtab *s;
@ -5823,8 +5823,8 @@ ada_make_symbol_completion_list (char *text0, char *word)
text = xstrdup (text0); text = xstrdup (text0);
make_cleanup (xfree, text); make_cleanup (xfree, text);
text_len = strlen (text); text_len = strlen (text);
wild_match = 0; wild_match_p = 0;
encoded = 1; encoded_p = 1;
} }
else else
{ {
@ -5834,12 +5834,12 @@ ada_make_symbol_completion_list (char *text0, char *word)
for (i = 0; i < text_len; i++) for (i = 0; i < text_len; i++)
text[i] = tolower (text[i]); text[i] = tolower (text[i]);
encoded = (strstr (text0, "__") != NULL); encoded_p = (strstr (text0, "__") != NULL);
/* If the name contains a ".", then the user is entering a fully /* If the name contains a ".", then the user is entering a fully
qualified entity name, and the match must not be done in wild qualified entity name, and the match must not be done in wild
mode. Similarly, if the user wants to complete what looks like mode. Similarly, if the user wants to complete what looks like
an encoded name, the match must not be done in wild mode. */ an encoded name, the match must not be done in wild mode. */
wild_match = (strchr (text0, '.') == NULL && !encoded); wild_match_p = (strchr (text0, '.') == NULL && !encoded_p);
} }
/* First, look at the partial symtab symbols. */ /* First, look at the partial symtab symbols. */
@ -5851,8 +5851,8 @@ ada_make_symbol_completion_list (char *text0, char *word)
data.text_len = text_len; data.text_len = text_len;
data.text0 = text0; data.text0 = text0;
data.word = word; data.word = word;
data.wild_match = wild_match; data.wild_match = wild_match_p;
data.encoded = encoded; data.encoded = encoded_p;
expand_partial_symbol_names (ada_expand_partial_symbol_name, &data); expand_partial_symbol_names (ada_expand_partial_symbol_name, &data);
} }
@ -5865,7 +5865,8 @@ ada_make_symbol_completion_list (char *text0, char *word)
{ {
QUIT; QUIT;
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (msymbol), symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (msymbol),
text, text_len, text0, word, wild_match, encoded); text, text_len, text0, word, wild_match_p,
encoded_p);
} }
/* Search upwards from currently selected frame (so that we can /* Search upwards from currently selected frame (so that we can
@ -5880,7 +5881,7 @@ ada_make_symbol_completion_list (char *text0, char *word)
{ {
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym), symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym),
text, text_len, text0, word, text, text_len, text0, word,
wild_match, encoded); wild_match_p, encoded_p);
} }
} }
@ -5895,7 +5896,7 @@ ada_make_symbol_completion_list (char *text0, char *word)
{ {
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym), symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym),
text, text_len, text0, word, text, text_len, text0, word,
wild_match, encoded); wild_match_p, encoded_p);
} }
} }
@ -5910,7 +5911,7 @@ ada_make_symbol_completion_list (char *text0, char *word)
{ {
symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym), symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym),
text, text_len, text0, word, text, text_len, text0, word,
wild_match, encoded); wild_match_p, encoded_p);
} }
} }