[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-358-gacee9d1

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  acee9d1c65bd97bbd5aa2b633e2455e87edbe836 (commit)
      from  2a25c968bf4ffec39ee76da0a164e46bd4215134 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit acee9d1c65bd97bbd5aa2b633e2455e87edbe836
Author: Andreas Fritiofson <and...@gm...>
Date:   Sat Jun 19 11:12:12 2010 +0200

    arm-jtag-ew: -Wshadow fix
    
    declaration of ‘index’ shadows a global declaration
    in /usr/include/string.h
    
    Signed-off-by: Andreas Fritiofson <and...@gm...>

diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 7a6c178..72c756e 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -568,29 +568,29 @@ static void armjtagew_tap_ensure_space(int scans, int bits)
 static void armjtagew_tap_append_step(int tms, int tdi)
 {
 	last_tms = tms;
-	int index = tap_length / 8;
+	int index_local = tap_length / 8;
 
-	if (index < ARMJTAGEW_TAP_BUFFER_SIZE)
+	if (index_local < ARMJTAGEW_TAP_BUFFER_SIZE)
 	{
 		int bit_index = tap_length % 8;
 		uint8_t bit = 1 << bit_index;
 
 		if (tms)
 		{
-			tms_buffer[index] |= bit;
+			tms_buffer[index_local] |= bit;
 		}
 		else
 		{
-			tms_buffer[index] &= ~bit;
+			tms_buffer[index_local] &= ~bit;
 		}
 
 		if (tdi)
 		{
-			tdi_buffer[index] |= bit;
+			tdi_buffer[index_local] |= bit;
 		}
 		else
 		{
-			tdi_buffer[index] &= ~bit;
+			tdi_buffer[index_local] &= ~bit;
 		}
 
 		tap_length++;

-----------------------------------------------------------------------

Summary of changes:
 src/jtag/drivers/arm-jtag-ew.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository