This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 050/238] [index] coffread.c: -Wshadow fix
- From: Andrey Smirnov <andrew dot smirnov at gmail dot com>
- To: gdb-patches at sourceware dot org
- Cc: Andrey Smirnov <andrew dot smirnov at gmail dot com>
- Date: Mon, 12 Dec 2011 19:38:53 -0800
- Subject: [PATCH 050/238] [index] coffread.c: -Wshadow fix
- References: <1323747545-29987-1-git-send-email-andrew.smirnov@gmail.com>
To ChangeLog:
* coffread.c (coff_lookup_type): Rename `index' to `idx'(-Wshadow).
(coff_alloc_type): Ditto.
(coff_read_struct_type): Ditto.
(coff_read_enum_type): Ditto.
---
gdb/coffread.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/gdb/coffread.c b/gdb/coffread.c
index cf8fb54..70b430f 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -325,15 +325,15 @@ cs_section_address (struct coff_symbol *cs, bfd *abfd)
or for associating a new type with the index. */
static struct type **
-coff_lookup_type (int index)
+coff_lookup_type (int idx)
{
- if (index >= type_vector_length)
+ if (idx >= type_vector_length)
{
int old_vector_length = type_vector_length;
type_vector_length *= 2;
- if (index /* is still */ >= type_vector_length)
- type_vector_length = index * 2;
+ if (idx /* is still */ >= type_vector_length)
+ type_vector_length = idx * 2;
type_vector = (struct type **)
xrealloc ((char *) type_vector,
@@ -341,7 +341,7 @@ coff_lookup_type (int index)
memset (&type_vector[old_vector_length], 0,
(type_vector_length - old_vector_length) * sizeof (struct type *));
}
- return &type_vector[index];
+ return &type_vector[idx];
}
/* Make sure there is a type allocated for type number index
@@ -349,9 +349,9 @@ coff_lookup_type (int index)
This can create an empty (zeroed) type object. */
static struct type *
-coff_alloc_type (int index)
+coff_alloc_type (int idx)
{
- struct type **type_addr = coff_lookup_type (index);
+ struct type **type_addr = coff_lookup_type (idx);
struct type *type = *type_addr;
/* If we are referring to a type not known at all yet,
@@ -1977,7 +1977,7 @@ decode_base_type (struct coff_symbol *cs,
object describing the type. */
static struct type *
-coff_read_struct_type (int index, int length, int lastsym,
+coff_read_struct_type (int idx, int length, int lastsym,
struct objfile *objfile)
{
struct nextfield
@@ -1998,7 +1998,7 @@ coff_read_struct_type (int index, int length, int lastsym,
union internal_auxent sub_aux;
int done = 0;
- type = coff_alloc_type (index);
+ type = coff_alloc_type (idx);
TYPE_CODE (type) = TYPE_CODE_STRUCT;
INIT_CPLUS_SPECIFIC (type);
TYPE_LENGTH (type) = length;
@@ -2070,7 +2070,7 @@ coff_read_struct_type (int index, int length, int lastsym,
Also defines the symbols that represent the values of the type. */
static struct type *
-coff_read_enum_type (int index, int length, int lastsym,
+coff_read_enum_type (int idx, int length, int lastsym,
struct objfile *objfile)
{
struct gdbarch *gdbarch = get_objfile_arch (objfile);
@@ -2089,7 +2089,7 @@ coff_read_enum_type (int index, int length, int lastsym,
char *name;
int unsigned_enum = 1;
- type = coff_alloc_type (index);
+ type = coff_alloc_type (idx);
if (within_function)
symlist = &local_symbols;
else
--
1.7.5.4