From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Wed, 16 Jun 2010 05:42:41 +0000 (+0200)
Subject: mflash: -Wshadow warning fix
X-Git-Tag: v0.5.0-rc1~597
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f4958d61ef4188ed02629968d21c3a4de3a89121;p=openocd

mflash: -Wshadow warning fix

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

diff --git a/src/flash/mflash.c b/src/flash/mflash.c
index d3078583..90e9888b 100644
--- a/src/flash/mflash.c
+++ b/src/flash/mflash.c
@@ -209,7 +209,7 @@ static int mg_init_gpio (void)
 	return ret;
 }
 
-static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
+static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time_var)
 {
 	uint8_t status, error;
 	struct target *target = mflash_bank->target;
@@ -220,7 +220,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
 	struct duration bench;
 	duration_start(&bench);
 
-	while (time) {
+	while (time_var) {
 
 		ret = target_read_u8(target, mg_task_reg + MG_REG_STATUS, &status);
 		if (ret != ERROR_OK)
@@ -280,7 +280,7 @@ static int mg_dsk_wait(mg_io_type_wait wait, uint32_t time)
 		else
 			LOG_ERROR("mflash: duration measurement failed: %d", ret);
 
-		if (t > time)
+		if (t > time_var)
 			break;
 	}