From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Date: Tue, 15 Nov 2011 23:14:37 +0000 (+0100)
Subject: bitq: reduce scope of variables
X-Git-Tag: v0.6.0-rc1~426
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=ed13d3d3bea6847dc40787d82ff161fef7ca68ca

bitq: reduce scope of variables

Change-Id: Ie1049b9d8ed5e44aee038e9181e423c35b4263c4
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/208
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
---

diff --git a/src/jtag/drivers/bitq.c b/src/jtag/drivers/bitq.c
index 064f43b011..db16757c85 100644
--- a/src/jtag/drivers/bitq.c
+++ b/src/jtag/drivers/bitq.c
@@ -43,9 +43,6 @@ static struct bitq_state bitq_in_state;
  */
 void bitq_in_proc(void)
 {
-	struct scan_field* field;
-	int           tdo;
-
 	/* loop through the queue */
 	while (bitq_in_state.cmd)
 	{
@@ -55,6 +52,7 @@ void bitq_in_proc(void)
 			/* loop through the fields */
 			while (bitq_in_state.field_idx < bitq_in_state.cmd->cmd.scan->num_fields)
 			{
+				struct scan_field *field;
 				field = &bitq_in_state.cmd->cmd.scan->fields[bitq_in_state.field_idx];
 				if (field->in_value)
 				{
@@ -66,7 +64,8 @@ void bitq_in_proc(void)
 						/* mask of next bit to be scanned */
 						uint8_t in_mask = 1 << (bitq_in_state.bit_pos % 8);
 
-						if ((tdo = bitq_interface->in()) < 0)
+						int tdo = bitq_interface->in();
+						if (tdo < 0)
 						{
 #ifdef _DEBUG_JTAG_IO_
 							LOG_DEBUG("bitq in EOF");