From: Andrey Smirnov <ndreys@sourceware.org>
Date: Mon, 5 Dec 2011 03:58:23 +0000 (+0000)
Subject: * bcache.c (bcache): Rename `bcache' to `cache'(-Wshadow).
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=12747160cdd53394993534cba8b791c59187530a;p=deliverable%2Fbinutils-gdb.git

* bcache.c (bcache): Rename `bcache' to `cache'(-Wshadow).
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7be3d1778c..9cbded963f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,4 +1,9 @@
 2011-12-05  Andrey Smirnov  <andrew.smirnov@gmail.com>
+
+	* bcache.c (bcache): Rename `bcache' to `cache'(-Wshadow).
+
+2011-12-05  Andrey Smirnov  <andrew.smirnov@gmail.com>
+
 	* amd64-tdep.c (amd64_push_dummy_call): Remove nested definition
 	of `tdep'(-Wshadow).
 
diff --git a/gdb/bcache.c b/gdb/bcache.c
index 76e3893647..5d7ed71ee4 100644
--- a/gdb/bcache.c
+++ b/gdb/bcache.c
@@ -209,9 +209,9 @@ expand_hash_table (struct bcache *bcache)
    never seen those bytes before, add a copy of them to BCACHE.  In
    either case, return a pointer to BCACHE's copy of that string.  */
 const void *
-bcache (const void *addr, int length, struct bcache *bcache)
+bcache (const void *addr, int length, struct bcache *cache)
 {
-  return bcache_full (addr, length, bcache, NULL);
+  return bcache_full (addr, length, cache, NULL);
 }
 
 /* Find a copy of the LENGTH bytes at ADDR in BCACHE.  If BCACHE has