From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10452 invoked by alias); 13 Dec 2011 03:41:30 -0000 Received: (qmail 10437 invoked by uid 22791); 13 Dec 2011 03:41:29 -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_CP X-Spam-Check-By: sourceware.org Received: from mail-gy0-f169.google.com (HELO mail-gy0-f169.google.com) (209.85.160.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Dec 2011 03:41:15 +0000 Received: by ghrr13 with SMTP id r13so45890ghr.0 for ; Mon, 12 Dec 2011 19:41:14 -0800 (PST) Received: by 10.50.85.197 with SMTP id j5mr8422543igz.32.1323747674426; Mon, 12 Dec 2011 19:41:14 -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.13 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Dec 2011 19:41:14 -0800 (PST) From: Andrey Smirnov To: gdb-patches@sourceware.org Cc: Andrey Smirnov Subject: [PATCH 043/238] [index] eval.c: -Wshadow fix Date: Tue, 13 Dec 2011 03:41:00 -0000 Message-Id: <1323747545-29987-9-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/msg00367.txt.bz2 To ChangeLog: * eval.c (init_array_element): Rename `index' to `idx'(-Wshadow). --- gdb/eval.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 5d758d1..c276f8f 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -450,7 +450,7 @@ init_array_element (struct value *array, struct value *element, struct expression *exp, int *pos, enum noside noside, LONGEST low_bound, LONGEST high_bound) { - LONGEST index; + LONGEST idx; int element_size = TYPE_LENGTH (value_type (element)); if (exp->elts[*pos].opcode == BINOP_COMMA) @@ -470,22 +470,22 @@ init_array_element (struct value *array, struct value *element, high = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside)); if (low < low_bound || high > high_bound) error (_("tuple range index out of range")); - for (index = low; index <= high; index++) + for (idx = low; idx <= high; idx++) { memcpy (value_contents_raw (array) - + (index - low_bound) * element_size, + + (idx - low_bound) * element_size, value_contents (element), element_size); } } else { - index = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside)); - if (index < low_bound || index > high_bound) + idx = value_as_long (evaluate_subexp (NULL_TYPE, exp, pos, noside)); + if (idx < low_bound || idx > high_bound) error (_("tuple index out of range")); - memcpy (value_contents_raw (array) + (index - low_bound) * element_size, + memcpy (value_contents_raw (array) + (idx - low_bound) * element_size, value_contents (element), element_size); } - return index; + return idx; } static struct value * -- 1.7.5.4