imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mingw32: -Wshadow fixes

Browse Source 
in jim.c (error: declaration of ‘boolean’ shadows a global declaration; /usr/local/lib/gcc/i686-w64-mingw32/4.4.2/../../../../i686-w64-mingw32/include/rpcndr.h:52: error: shadowed declaration is here)

Signed-off-by: Freddie Chopin <freddie_chopin@op.pl>
This commit is contained in:
Freddie Chopin 2010-06-17 20:06:28 +02:00 committed by Øyvind Harboe
parent f2f798fdd3
commit b1cd202f9a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/helper/jim.c
View File

@ -9942,12 +9942,12 @@ noopt:
/* The general purpose implementation of while starts here */
while (1) {
int boolean, retval;
int local_boolean, retval;
if ((retval = Jim_GetBoolFromExpr(interp, argv[1],
&boolean)) != JIM_OK)
&local_boolean)) != JIM_OK)
return retval;
if (!boolean) break;
if (!local_boolean) break;
if ((retval = Jim_EvalObj(interp, argv[2])) != JIM_OK) {
switch (retval) {
case JIM_BREAK:
@ -10146,13 +10146,13 @@ evalstart:
if ((retval = Jim_EvalObj(interp, argv[1])) != JIM_OK)
return retval;
while (1) {
int boolean;
int local_boolean;
testcond:
/* Test the condition */
if ((retval = Jim_GetBoolFromExpr(interp, argv[2], &boolean))
if ((retval = Jim_GetBoolFromExpr(interp, argv[2], &local_boolean))
!= JIM_OK)
return retval;
if (!boolean) break;
if (!local_boolean) break;
/* Eval body */
if ((retval = Jim_EvalObj(interp, argv[4])) != JIM_OK) {
switch (retval) {
@ -10297,13 +10297,13 @@ static int Jim_LmapCoreCommand(Jim_Interp *interp, int argc,
static int Jim_IfCoreCommand(Jim_Interp *interp, int argc,
Jim_Obj *const *argv)
{
int boolean, retval, current = 1, falsebody = 0;
int local_boolean, retval, current = 1, falsebody = 0;
if (argc >= 3) {
while (1) {
/* Far not enough arguments given! */
if (current >= argc) goto err;
if ((retval = Jim_GetBoolFromExpr(interp,
argv[current++], &boolean))
argv[current++], &local_boolean))
!= JIM_OK)
return retval;
/* There lacks something, isn't it? */
@ -10312,7 +10312,7 @@ static int Jim_IfCoreCommand(Jim_Interp *interp, int argc,
"then")) current++;
/* Tsk tsk, no then-clause? */
if (current >= argc) goto err;
if (boolean)
if (local_boolean)
return Jim_EvalObj(interp, argv[current]);
/* Ok: no else-clause follows */
if (++current >= argc) {