From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12742 invoked by alias); 27 Nov 2011 12:54:11 -0000 Received: (qmail 12734 invoked by uid 22791); 27 Nov 2011 12:54:10 -0000 X-SWARE-Spam-Status: No, hits=0.4 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KAM_STOCKTIP,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-bw0-f41.google.com (HELO mail-bw0-f41.google.com) (209.85.214.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 27 Nov 2011 12:53:56 +0000 Received: by bke17 with SMTP id 17so7753373bke.0 for ; Sun, 27 Nov 2011 04:53:55 -0800 (PST) Received: by 10.205.120.20 with SMTP id fw20mr41972190bkc.39.1322398435485; Sun, 27 Nov 2011 04:53:55 -0800 (PST) Received: from localhost.localdomain (l49-9-169.cn.ru. [178.49.9.169]) by mx.google.com with ESMTPS id h7sm24227461bkw.12.2011.11.27.04.53.53 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 27 Nov 2011 04:53:54 -0800 (PST) From: Andrey Smirnov To: gdb-patches@sourceware.org Cc: brobecker@adacore.com, Andrey Smirnov Subject: [PATCH 008/238] Fix Wshadow Date: Sun, 27 Nov 2011 12:54:00 -0000 Message-Id: <1322398359-1364-1-git-send-email-andrew.smirnov@gmail.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-11/txt/msg00720.txt.bz2 Rewritten so it is `wild_match_p' instead of `wild_mode_flag'. --- gdb/ChangeLog | 5 +++++ gdb/ada-lang.c | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7499e45..5ef7c28 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-11-19 Andrey Smirnov + * ada-lang.c (ada_make_symbol_completion_list): Rename + `wild_match' to `wild_match_p'(-Wshadow). + +2011-11-19 Andrey Smirnov + * ada-lang.c (ada_index_struct_field): Fix -Wshadow warnings. 2011-11-19 Andrey Smirnov diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d73e314..64b7f56 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -5650,7 +5650,7 @@ ada_make_symbol_completion_list (char *text0, char *word) { char *text; int text_len; - int wild_match; + int wild_match_p; int encoded; VEC(char_ptr) *completions = VEC_alloc (char_ptr, 128); struct symbol *sym; @@ -5666,7 +5666,7 @@ ada_make_symbol_completion_list (char *text0, char *word) text = xstrdup (text0); make_cleanup (xfree, text); text_len = strlen (text); - wild_match = 0; + wild_match_p = 0; encoded = 1; } else @@ -5682,7 +5682,7 @@ ada_make_symbol_completion_list (char *text0, char *word) qualified entity name, and the match must not be done in wild mode. Similarly, if the user wants to complete what looks like 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); } /* First, look at the partial symtab symbols. */ @@ -5694,7 +5694,7 @@ ada_make_symbol_completion_list (char *text0, char *word) data.text_len = text_len; data.text0 = text0; data.word = word; - data.wild_match = wild_match; + data.wild_match = wild_match_p; data.encoded = encoded; expand_partial_symbol_names (ada_expand_partial_symbol_name, &data); } @@ -5708,7 +5708,7 @@ ada_make_symbol_completion_list (char *text0, char *word) { QUIT; 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); } /* Search upwards from currently selected frame (so that we can @@ -5723,7 +5723,7 @@ ada_make_symbol_completion_list (char *text0, char *word) { symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym), text, text_len, text0, word, - wild_match, encoded); + wild_match_p, encoded); } } @@ -5738,7 +5738,7 @@ ada_make_symbol_completion_list (char *text0, char *word) { symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym), text, text_len, text0, word, - wild_match, encoded); + wild_match_p, encoded); } } @@ -5753,7 +5753,7 @@ ada_make_symbol_completion_list (char *text0, char *word) { symbol_completion_add (&completions, SYMBOL_LINKAGE_NAME (sym), text, text_len, text0, word, - wild_match, encoded); + wild_match_p, encoded); } } -- 1.7.5.4