From: Øyvind Harboe <oyvind.harboe@zylin.com>
Date: Wed, 16 Jun 2010 06:19:25 +0000 (+0200)
Subject: xsvf: -Wshadow warning fixes
X-Git-Tag: v0.5.0-rc1~595
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cd9c61cc068635fa707981decfea600ee7e94201;p=openocd

xsvf: -Wshadow warning fixes

I think this fixed an error message where the error
message would show the *previous* uc code rather than
the current unsupported uc code.

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

diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c
index dff1a1ec..51d0e7b1 100644
--- a/src/xsvf/xsvf.c
+++ b/src/xsvf/xsvf.c
@@ -269,7 +269,6 @@ COMMAND_HANDLER(handle_xsvf_command)
 		 */
 		if (collecting_path) {
 			tap_state_t	mystate;
-			uint8_t		uc;
 
 			switch (opcode) {
 			case XCOMMENT:
@@ -565,7 +564,6 @@ COMMAND_HANDLER(handle_xsvf_command)
 		case XSTATE:
 			{
 				tap_state_t	mystate;
-				uint8_t			uc;
 
 				if (read(xsvf_fd, &uc, 1) < 0)
 				{