From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: gdb-patches@sourceware.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 043/238] [index] eval.c: -Wshadow fix
Date: Tue, 13 Dec 2011 03:41:00 -0000 [thread overview]
Message-ID: <1323747545-29987-9-git-send-email-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <1323747545-29987-1-git-send-email-andrew.smirnov@gmail.com>
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
next prev parent reply other threads:[~2011-12-13 3:41 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-13 3:41 [PATCH 035/238] [index] python/py-evtregistry.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 049/238] [index] completer.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 047/238] [index] cp-support.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 036/238] [index] i386-tdep.c: " Andrey Smirnov
2011-12-13 8:17 ` Mark Kettenis
2011-12-13 12:36 ` Eli Zaretskii
2011-12-13 16:47 ` Mark Kettenis
2011-12-13 3:41 ` [PATCH 039/238] [index] findcmd.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 037/238] [index] gnu-v2-abi.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 042/238] [index] exec.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 056/238] [index] symtab.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 045/238] [index] dwarf2read.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 038/238] [index] gdbtypes.c: " Andrey Smirnov
2011-12-13 3:41 ` Andrey Smirnov [this message]
2011-12-13 3:41 ` [PATCH 048/238] [index] cp-abi.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 058/238] [index] valops.c: " Andrey Smirnov
2011-12-13 3:41 ` [PATCH 041/238] [index] f-typeprint.c: " Andrey Smirnov
2011-12-13 3:46 ` [PATCH 040/238] [index] f-valprint.c " Andrey Smirnov
2011-12-13 3:46 ` [PATCH 051/238] [index] gnu-v3-abi.c: " Andrey Smirnov
2011-12-13 3:47 ` [PATCH 050/238] [index] coffread.c: " Andrey Smirnov
2011-12-13 3:47 ` [PATCH 057/238] [index] valarith.c: " Andrey Smirnov
2011-12-13 3:47 ` [PATCH 053/238] [index] parse.c: " Andrey Smirnov
2011-12-13 3:47 ` [PATCH 060/238] [index] varobj.c: " Andrey Smirnov
2011-12-13 3:47 ` [PATCH 044/238] [index] dwarf2read.c: " Andrey Smirnov
2011-12-13 3:47 ` [PATCH 054/238] [index] stabsread.c: " Andrey Smirnov
2011-12-13 3:48 ` [PATCH 046/238] [index] dcache.c: " Andrey Smirnov
2011-12-13 3:48 ` [PATCH 061/238] [index] wrapper.c: " Andrey Smirnov
2011-12-13 3:49 ` [PATCH 059/238] [index] value.c: " Andrey Smirnov
2011-12-13 3:49 ` [PATCH 055/238] [index] symmisc.c: " Andrey Smirnov
2011-12-13 3:49 ` [PATCH 062/238] [index] mi/mi-cmds.c: " Andrey Smirnov
2011-12-13 7:18 ` [PATCH 052/238] [index] linespec.c: " Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1323747545-29987-9-git-send-email-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox