jim: -Wshadow warning fix
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
This commit is contained in:
parent
3c8a0e72f3
commit
00017c90ae
File diff suppressed because it is too large
Load Diff
|
@ -11907,15 +11907,15 @@ static int Jim_ScanCoreCommand(Jim_Interp *interp, int argc,
|
||||||
}
|
}
|
||||||
if (argc > 3) {
|
if (argc > 3) {
|
||||||
int maxPos = FormatGetMaxPos(argv[2]);
|
int maxPos = FormatGetMaxPos(argv[2]);
|
||||||
int count = FormatGetCnvCount(argv[2]);
|
int arg_count = FormatGetCnvCount(argv[2]);
|
||||||
if (maxPos > argc-3) {
|
if (maxPos > argc-3) {
|
||||||
Jim_SetResultString(interp, "\"%n$\" argument index out of range", -1);
|
Jim_SetResultString(interp, "\"%n$\" argument index out of range", -1);
|
||||||
return JIM_ERR;
|
return JIM_ERR;
|
||||||
} else if (count != 0 && count < argc-3) {
|
} else if (arg_count != 0 && arg_count < argc-3) {
|
||||||
Jim_SetResultString(interp, "variable is not assigned by any "
|
Jim_SetResultString(interp, "variable is not assigned by any "
|
||||||
"conversion specifiers", -1);
|
"conversion specifiers", -1);
|
||||||
return JIM_ERR;
|
return JIM_ERR;
|
||||||
} else if (count > argc-3) {
|
} else if (arg_count > argc-3) {
|
||||||
Jim_SetResultString(interp, "different numbers of variable names and "
|
Jim_SetResultString(interp, "different numbers of variable names and "
|
||||||
"field specifiers", -1);
|
"field specifiers", -1);
|
||||||
return JIM_ERR;
|
return JIM_ERR;
|
||||||
|
|
Loading…
Reference in New Issue