From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 15 Jun 2010 22:02:58 +0000 (+0200)
Subject: str7x: -Wshadow warning fixes
X-Git-Tag: v0.5.0-rc1~604
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8022940c5c3a12ecdbc8f8866351ee0ef5de1d35;p=openocd

str7x: -Wshadow warning fixes

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
---

diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c
index 46510ed4..4c450afa 100644
--- a/src/flash/nor/str7x.c
+++ b/src/flash/nor/str7x.c
@@ -625,7 +625,7 @@ static int str7x_write(struct flash_bank *bank, uint8_t *buffer,
 	if (bytes_remaining)
 	{
 		uint8_t last_dword[8] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-		int i = 0;
+		i = 0;
 
 		while (bytes_remaining > 0)
 		{
@@ -680,7 +680,7 @@ COMMAND_HANDLER(str7x_handle_part_id_command)
 }
 #endif
 
-static int str7x_info(struct flash_bank *bank, char *buf, int buf_size)
+static int get_str7x_info(struct flash_bank *bank, char *buf, int buf_size)
 {
 	snprintf(buf, buf_size, "str7x flash driver info");
 	/* STR7x flash doesn't support sector protection interrogation.
@@ -795,5 +795,5 @@ struct flash_driver str7x_flash = {
 	.auto_probe = str7x_probe,
 	.erase_check = default_flash_blank_check,
 	.protect_check = str7x_protect_check,
-	.info = str7x_info,
+	.info = get_str7x_info,
 };