From 00017c90ae82d3237f5a4784caa695459c5897d2 Mon Sep 17 00:00:00 2001 From: Øyvind Harboe Date: Tue, 15 Jun 2010 22:47:52 +0200 Subject: jim: -Wshadow warning fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Øyvind Harboe --- src/helper/jim.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/helper/jim.c') diff --git a/src/helper/jim.c b/src/helper/jim.c index 8b0014f3..85389549 100644 --- a/src/helper/jim.c +++ b/src/helper/jim.c @@ -11907,15 +11907,15 @@ static int Jim_ScanCoreCommand(Jim_Interp *interp, int argc, } if (argc > 3) { int maxPos = FormatGetMaxPos(argv[2]); - int count = FormatGetCnvCount(argv[2]); + int arg_count = FormatGetCnvCount(argv[2]); if (maxPos > argc-3) { Jim_SetResultString(interp, "\"%n$\" argument index out of range", -1); 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 " "conversion specifiers", -1); return JIM_ERR; - } else if (count > argc-3) { + } else if (arg_count > argc-3) { Jim_SetResultString(interp, "different numbers of variable names and " "field specifiers", -1); return JIM_ERR; -- cgit v1.2.3