From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10740 invoked by alias); 13 Dec 2011 03:41:32 -0000 Received: (qmail 10611 invoked by uid 22791); 13 Dec 2011 03:41:31 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,TW_BJ X-Spam-Check-By: sourceware.org Received: from mail-gx0-f169.google.com (HELO mail-gx0-f169.google.com) (209.85.161.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Dec 2011 03:41:16 +0000 Received: by ggni2 with SMTP id i2so7693325ggn.0 for ; Mon, 12 Dec 2011 19:41:16 -0800 (PST) Received: by 10.50.237.5 with SMTP id uy5mr17631391igc.50.1323747675856; Mon, 12 Dec 2011 19:41:15 -0800 (PST) Received: from localhost.localdomain (c-24-18-115-186.hsd1.wa.comcast.net. [24.18.115.186]) by mx.google.com with ESMTPS id e2sm81168651ibe.0.2011.12.12.19.41.15 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Dec 2011 19:41:15 -0800 (PST) From: Andrey Smirnov To: gdb-patches@sourceware.org Cc: Andrey Smirnov Subject: [PATCH 045/238] [index] dwarf2read.c: -Wshadow fix Date: Tue, 13 Dec 2011 03:41:00 -0000 Message-Id: <1323747545-29987-11-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: <1323747545-29987-1-git-send-email-andrew.smirnov@gmail.com> References: <1323747545-29987-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-12/txt/msg00370.txt.bz2 To ChangeLog: * dwarf2read.c (dw2_expand_symtabs_matching): Rename `index' to `mapped_ndx'(-Wshadow). --- gdb/dwarf2read.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 25ebcfa..363a92d 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -2726,14 +2726,14 @@ dw2_expand_symtabs_matching (struct objfile *objfile, { int i; offset_type iter; - struct mapped_index *index; + struct mapped_index *mapped_ndx; dw2_setup (objfile); /* index_table is NULL if OBJF_READNOW. */ if (!dwarf2_per_objfile->index_table) return; - index = dwarf2_per_objfile->index_table; + mapped_ndx = dwarf2_per_objfile->index_table; if (file_matcher != NULL) for (i = 0; i < (dwarf2_per_objfile->n_comp_units @@ -2761,24 +2761,24 @@ dw2_expand_symtabs_matching (struct objfile *objfile, } } - for (iter = 0; iter < index->symbol_table_slots; ++iter) + for (iter = 0; iter < mapped_ndx->symbol_table_slots; ++iter) { offset_type idx = 2 * iter; const char *name; offset_type *vec, vec_len, vec_idx; - if (index->symbol_table[idx] == 0 && index->symbol_table[idx + 1] == 0) + if (mapped_ndx->symbol_table[idx] == 0 && mapped_ndx->symbol_table[idx + 1] == 0) continue; - name = index->constant_pool + MAYBE_SWAP (index->symbol_table[idx]); + name = mapped_ndx->constant_pool + MAYBE_SWAP (mapped_ndx->symbol_table[idx]); if (! (*name_matcher) (name, data)) continue; /* The name was matched, now expand corresponding CUs that were marked. */ - vec = (offset_type *) (index->constant_pool - + MAYBE_SWAP (index->symbol_table[idx + 1])); + vec = (offset_type *) (mapped_ndx->constant_pool + + MAYBE_SWAP (mapped_ndx->symbol_table[idx + 1])); vec_len = MAYBE_SWAP (vec[0]); for (vec_idx = 0; vec_idx < vec_len; ++vec_idx) { -- 1.7.5.4