[Openocd-development] [PATCH] arm-jtag-ew: -Wshadow fix

2010-06-19 Thread Andreas Fritiofson
declaration of ‘index’ shadows a global declaration
in /usr/include/string.h

Signed-off-by: Andreas Fritiofson andreas.fritiof...@gmail.com
---
I'm not convinced of the benefit of the warning in this case. A whole bunch
of other warnings or error would catch the bug if the local variable index
had been used in place of the system header declared _function_ index. I had
expected the warning to be emitted only for shadowing of compatible types.
---
 src/jtag/drivers/arm-jtag-ew.c |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)

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++;
-- 
1.6.3.3

___
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development


Re: [Openocd-development] [PATCH] arm-jtag-ew: -Wshadow fix

2010-06-19 Thread Øyvind Harboe
Merged.

Thanks!



-- 
Øyvind Harboe
US toll free 1-866-980-3434 / International +47 51 63 25 00
http://www.zylin.com/zy1000.html
ARM7 ARM9 ARM11 XScale Cortex
JTAG debugger and flash programmer
___
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development


Re: [Openocd-development] -Wshadow is now default

2010-06-19 Thread Edgar Grimberg
On Wed, Jun 16, 2010 at 9:07 AM, Øyvind Harboe oyvind.har...@zylin.com wrote:
 I've made -Wshadow default.

I get a compilation error when building on a Mac:

  System Version:   Mac OS X 10.6.4 (10F569)
  Kernel Version:   Darwin 10.4.0

configured only with dummy driver:

./configure --enable-maintainer-mode --enable-dummy

and the error is:

/bin/sh ../../libtool --tag=CC   --mode=compile gcc -std=gnu99
-DHAVE_CONFIG_H -I. -I../..  -I../../src -I../../src   -g -O2 -Wall
-Wstrict-prototypes -Wformat-security -Wshadow -Wextra
-Wno-unused-parameter -Wbad-function-cast -Wcast-align
-Wredundant-decls -Werror -MT target.lo -MD -MP -MF .deps/target.Tpo
-c -o target.lo target.c
libtool: compile:  gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I../..
-I../../src -I../../src -g -O2 -Wall -Wstrict-prototypes
-Wformat-security -Wshadow -Wextra -Wno-unused-parameter
-Wbad-function-cast -Wcast-align -Wredundant-decls -Werror -MT
target.lo -MD -MP -MF .deps/target.Tpo -c target.c -o target.o
cc1: warnings being treated as errors
target.c: In function ‘handle_halt_command’:
target.c:2138: warning: declaration of ‘wait’ shadows a global declaration
/usr/include/sys/wait.h:255: warning: shadowed declaration is here

I am using this:
HEAD is now at acee9d1 arm-jtag-ew: -Wshadow fix

Regards,
Edgar


-- 
Edgar Grimberg
System Developer
Zylin AS

ZY1000 JTAG Debugger http://www.zylin.com/zy1000.html
Phone: (+47) 51 63 25 00
___
Openocd-development mailing list
Openocd-development@lists.berlios.de
https://lists.berlios.de/mailman/listinfo/openocd-development