From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11366 invoked by alias); 28 Nov 2011 15:19:55 -0000 Received: (qmail 11352 invoked by uid 22791); 28 Nov 2011 15:19:53 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,KAM_STOCKGEN,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-fx0-f41.google.com (HELO mail-fx0-f41.google.com) (209.85.161.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 28 Nov 2011 15:19:40 +0000 Received: by faaa26 with SMTP id a26so280319faa.0 for ; Mon, 28 Nov 2011 07:19:39 -0800 (PST) Received: by 10.204.149.216 with SMTP id u24mr45017006bkv.73.1322493578924; Mon, 28 Nov 2011 07:19:38 -0800 (PST) Received: from localhost.localdomain (l49-9-169.cn.ru. [178.49.9.169]) by mx.google.com with ESMTPS id z7sm30274839bka.1.2011.11.28.07.19.37 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Nov 2011 07:19:38 -0800 (PST) From: Andrey Smirnov To: gdb-patches@sourceware.org Subject: [PATCH 034/238] [misc.] Fix -Wshadow warnings. Date: Mon, 28 Nov 2011 15:19:00 -0000 Message-Id: <1322493561-29643-1-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: <4ECC3FD2.1000309@earthlink.net> References: <4ECC3FD2.1000309@earthlink.net> 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/msg00759.txt.bz2 Cause: Local variable shadows function parameter. To ChangeLog: * breakpoint.c (update_static_tracepoint): Rename `sal' to `sal2'(-Wshadow). --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f433ef5..8d1b4dd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-11-22 Andrey Smirnov + * breakpoint.c (update_static_tracepoint): Fix -Wshadow + warnings. + +2011-11-22 Andrey Smirnov + * breakpoint.c (update_global_location_list): Fix -Wshadow warnings. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 91a4224..9b359aa 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -11640,26 +11640,26 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal) if (!VEC_empty(static_tracepoint_marker_p, markers)) { - struct symtab_and_line sal; + struct symtab_and_line sal2; struct symbol *sym; - struct static_tracepoint_marker *marker; + struct static_tracepoint_marker *tpmarker; struct ui_out *uiout = current_uiout; - marker = VEC_index (static_tracepoint_marker_p, markers, 0); + tpmarker = VEC_index (static_tracepoint_marker_p, markers, 0); xfree (tp->static_trace_marker_id); - tp->static_trace_marker_id = xstrdup (marker->str_id); + tp->static_trace_marker_id = xstrdup (tpmarker->str_id); warning (_("marker for static tracepoint %d (%s) not " "found at previous line number"), b->number, tp->static_trace_marker_id); - init_sal (&sal); + init_sal (&sal2); - sal.pc = marker->address; + sal2.pc = tpmarker->address; - sal = find_pc_line (marker->address, 0); - sym = find_pc_sect_function (marker->address, NULL); + sal2 = find_pc_line (tpmarker->address, 0); + sym = find_pc_sect_function (tpmarker->address, NULL); ui_out_text (uiout, "Now in "); if (sym) { @@ -11667,36 +11667,36 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal) SYMBOL_PRINT_NAME (sym)); ui_out_text (uiout, " at "); } - ui_out_field_string (uiout, "file", sal.symtab->filename); + ui_out_field_string (uiout, "file", sal2.symtab->filename); ui_out_text (uiout, ":"); if (ui_out_is_mi_like_p (uiout)) { - char *fullname = symtab_to_fullname (sal.symtab); + char *fullname = symtab_to_fullname (sal2.symtab); if (fullname) ui_out_field_string (uiout, "fullname", fullname); } - ui_out_field_int (uiout, "line", sal.line); + ui_out_field_int (uiout, "line", sal2.line); ui_out_text (uiout, "\n"); - b->line_number = sal.line; + b->line_number = sal2.line; xfree (b->source_file); if (sym) - b->source_file = xstrdup (sal.symtab->filename); + b->source_file = xstrdup (sal2.symtab->filename); else b->source_file = NULL; xfree (b->addr_string); b->addr_string = xstrprintf ("%s:%d", - sal.symtab->filename, b->line_number); + sal2.symtab->filename, b->line_number); /* Might be nice to check if function changed, and warn if so. */ - release_static_tracepoint_marker (marker); + release_static_tracepoint_marker (tpmarker); } } return sal; -- 1.7.5.4