diff options
| author | Freddie Chopin <freddie_chopin@op.pl> | 2010-06-17 20:06:28 +0200 |
|---|---|---|
| committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2010-06-17 21:09:24 +0200 |
| commit | b1cd202f9ad8c95a70548d946ca3073553a340cf (patch) | |
| tree | 4de270c2cae67da84a136ac24e97fb856459c541 /src | |
| parent | f2f798fdd3a4c6d221569ba278945385c2f47504 (diff) | |
| download | openocd+libswd-b1cd202f9ad8c95a70548d946ca3073553a340cf.tar.gz openocd+libswd-b1cd202f9ad8c95a70548d946ca3073553a340cf.tar.bz2 openocd+libswd-b1cd202f9ad8c95a70548d946ca3073553a340cf.tar.xz openocd+libswd-b1cd202f9ad8c95a70548d946ca3073553a340cf.zip | |
mingw32: -Wshadow fixes
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/jim.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/helper/jim.c b/src/helper/jim.c index 85389549..e9a6ec5b 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -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) { |