From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Tue, 15 Jun 2010 21:09:12 +0000 (+0200)
Subject: arm_dpm: -Wshadow warning fix
X-Git-Tag: v0.5.0-rc1~624
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=748863c2e23aca05a81007ca87129a30eac005c4;p=openocd

arm_dpm: -Wshadow warning fix

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

diff --git a/src/target/arm_dpm.c b/src/target/arm_dpm.c
index 213afbd3..4fbe5e3b 100644
--- a/src/target/arm_dpm.c
+++ b/src/target/arm_dpm.c
@@ -773,11 +773,11 @@ static int dpm_remove_breakpoint(struct target *target, struct breakpoint *bp)
 	return retval;
 }
 
-static int dpm_watchpoint_setup(struct arm_dpm *dpm, unsigned index,
+static int dpm_watchpoint_setup(struct arm_dpm *dpm, unsigned index_t,
 		struct watchpoint *wp)
 {
 	int retval;
-	struct dpm_wp *dwp = dpm->dwp + index;
+	struct dpm_wp *dwp = dpm->dwp + index_t;
 	uint32_t control;
 
 	/* this hardware doesn't support data value matching or masking */
@@ -804,7 +804,7 @@ static int dpm_watchpoint_setup(struct arm_dpm *dpm, unsigned index,
 	}
 	dwp->bpwp.control = control;
 
-	dpm->dwp[index].wp = wp;
+	dpm->dwp[index_t].wp = wp;
 
 	return retval;
 }