From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2967 invoked by alias); 28 Nov 2011 15:07:13 -0000 Received: (qmail 2917 invoked by uid 22791); 28 Nov 2011 15:07:08 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-bw0-f41.google.com (HELO mail-bw0-f41.google.com) (209.85.214.41) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 28 Nov 2011 15:06:45 +0000 Received: by bke17 with SMTP id 17so9773094bke.0 for ; Mon, 28 Nov 2011 07:06:43 -0800 (PST) Received: by 10.204.136.200 with SMTP id s8mr45130730bkt.49.1322492803437; Mon, 28 Nov 2011 07:06:43 -0800 (PST) Received: from localhost.localdomain (l49-9-169.cn.ru. [178.49.9.169]) by mx.google.com with ESMTPS id q6sm30189806bka.6.2011.11.28.07.06.41 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Nov 2011 07:06:42 -0800 (PST) From: Andrey Smirnov To: gdb-patches@sourceware.org Subject: [PATCH 022/238] [misc.] bcache.c: -Wshadow fix. Date: Mon, 28 Nov 2011 15:07:00 -0000 Message-Id: <1322492788-29388-1-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: References: 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/msg00756.txt.bz2 Cause: Clashes with `bcache' function from "bcache.h". To ChangeLog: * bcache.c (expand_hash_table): Rename `bcache' to `cache'(-Wshadow). --- gdb/ChangeLog | 5 +++++ gdb/bcache.c | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ce5f86..57ee41f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-11-22 Andrey Smirnov + * bcache.c (expand_hash_table): Fix -Wshadow + warnings. + +2011-11-22 Andrey Smirnov + * annotate.c (annotate_array_section_begin): Fix -Wshadow warnings. diff --git a/gdb/bcache.c b/gdb/bcache.c index 76e3893..5c287d9 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 *cache) { /* 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; + cache->expand_count++; + cache->expand_hash_count += cache->unique_count; /* Find the next size. */ - new_num_buckets = bcache->num_buckets * 2; + new_num_buckets = cache->num_buckets * 2; for (i = 0; i < (sizeof (sizes) / sizeof (sizes[0])); i++) - if (sizes[i] > bcache->num_buckets) + if (sizes[i] > cache->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; + cache->structure_size -= (cache->num_buckets + * sizeof (cache->bucket[0])); + cache->structure_size += new_size; } /* Rehash all existing strings. */ - for (i = 0; i < bcache->num_buckets; i++) + for (i = 0; i < cache->num_buckets; i++) { struct bstring *s, *next; - for (s = bcache->bucket[i]; s; s = next) + for (s = cache->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[(cache->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 (cache->bucket) + xfree (cache->bucket); + cache->bucket = new_buckets; + cache->num_buckets = new_num_buckets; } -- 1.7.5.4