[PATCH 22/348] Fix -Wsahdow warnings

Andrey Smirnov
2011-11-22T13:07:50Z

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Fix -Wshadow warnings --]
[-- Type: text/x-diff, Size: 3232 bytes --]

From c372a035d5c676f7f4e0f63af1ba43726ad29333 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrew.smirnov@gmail.com>
Date: Tue, 22 Nov 2011 17:34:32 +0700
Subject: [PATCH 22/39] Fix -Wshadow warnings.

* bcache.c (expand_hash_table): Fix -Wshadow
warnings.
---
gdb/ChangeLog | 5 +++++
gdb/bcache.c | 30 +++++++++++++++---------------
2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f6711e4..d972e6a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2011-11-22 Andrey Smirnov <andrew.smirnov@gmail.com>

+ * bcache.c (expand_hash_table): Fix -Wshadow
+ warnings.
+
+2011-11-22 Andrey Smirnov <andrew.smirnov@gmail.com>
+
* annotate.c (annotate_array_section_begin): Fix -Wshadow
warnings.

diff --git a/gdb/bcache.c b/gdb/bcache.c
index 76e3893..f7543f4 100644
--- a/gdb/bcache.c
+++ b/gdb/bcache.c
@@ -130,7 +130,7 @@ hash_continue (const void *addr, int length, unsigned long h)
#define CHAIN_LENGTH_THRESHOLD (5)

static void
-expand_hash_table (struct bcache *bcache)
+expand_hash_table (struct bcache *cahce)
{
/* A table of good hash table sizes. Whenever we grow, we pick the
next larger size from this table. sizes[i] is close to 1 << (i+10),
@@ -149,13 +149,13 @@ expand_hash_table (struct bcache *bcache)

/* Count the stats. Every unique item needs to be re-hashed and
re-entered. */
- bcache->expand_count++;
- bcache->expand_hash_count += bcache->unique_count;
+ cahce->expand_count++;
+ cahce->expand_hash_count += cahce->unique_count;

/* Find the next size. */
- new_num_buckets = bcache->num_buckets * 2;
+ new_num_buckets = cahce->num_buckets * 2;
for (i = 0; i < (sizeof (sizes) / sizeof (sizes[0])); i++)
- if (sizes[i] > bcache->num_buckets)
+ if (sizes[i] > cahce->num_buckets)
{
new_num_buckets = sizes[i];
break;
@@ -168,22 +168,22 @@ expand_hash_table (struct bcache *bcache)
new_buckets = (struct bstring **) xmalloc (new_size);
memset (new_buckets, 0, new_size);

- bcache->structure_size -= (bcache->num_buckets
- * sizeof (bcache->bucket[0]));
- bcache->structure_size += new_size;
+ cahce->structure_size -= (cahce->num_buckets
+ * sizeof (cahce->bucket[0]));
+ cahce->structure_size += new_size;
}

/* Rehash all existing strings. */
- for (i = 0; i < bcache->num_buckets; i++)
+ for (i = 0; i < cahce->num_buckets; i++)
{
struct bstring *s, *next;

- for (s = bcache->bucket[i]; s; s = next)
+ for (s = cahce->bucket[i]; s; s = next)
{
struct bstring **new_bucket;
next = s->next;

- new_bucket = &new_buckets[(bcache->hash_function (&s->d.data,
+ new_bucket = &new_buckets[(cahce->hash_function (&s->d.data,
s->length)
% new_num_buckets)];
s->next = *new_bucket;
@@ -192,10 +192,10 @@ expand_hash_table (struct bcache *bcache)
}

/* Plug in the new table. */
- if (bcache->bucket)
- xfree (bcache->bucket);
- bcache->bucket = new_buckets;
- bcache->num_buckets = new_num_buckets;
+ if (cahce->bucket)
+ xfree (cahce->bucket);
+ cahce->bucket = new_buckets;
+ cahce->num_buckets = new_num_buckets;
}

\f
--
1.7.5.4