[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-303-g00017c9

[Øyvind H. <go...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  00017c90ae82d3237f5a4784caa695459c5897d2 (commit)
      from  3c8a0e72f38e47bfc78dc7ab44ce2ec16cfac53b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 00017c90ae82d3237f5a4784caa695459c5897d2
Author: Øyvind Harboe <oyv...@zy...>
Date:   Tue Jun 15 22:47:52 2010 +0200

    jim: -Wshadow warning fix
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/helper/jim.c b/src/helper/#jim.c#
similarity index 99%
copy from src/helper/jim.c
copy to src/helper/#jim.c#
index 8b0014f..c8583de 100644
--- a/src/helper/jim.c
+++ b/src/helper/#jim.c#
@@ -3,7 +3,7 @@
  * Copyright 2005 Salvatore Sanfilippo <an...@in...>
  * Copyright 2005 Clemens Hintze <c.h...@gm...>
  * Copyright 2005 patthoyts - Pat Thoyts <pat...@us...>
- * Copyright 2008,2009 oharboe - Øyvind Harboe - oyv...@zy...
+ * Copyright 2008,2009 oharboe - Øyvind Harboe - oyv...@zy...
  * Copyright 2008 Andrew Lunn <an...@lu...>
  * Copyright 2008 Duane Ellis <op...@du...>
  * Copyright 2008 Uwe Klein <uk...@kl...>
@@ -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;
@@ -11934,26 +11934,7 @@ static int Jim_ScanCoreCommand(Jim_Interp *interp, int argc,
         }
         JimListGetElements(interp, listPtr, &outc, &outVec);
         for (i = 0; i < outc; ++i) {
-            if (Jim_Length(outVec[i]) > 0) {
-                ++count;
-                if (Jim_SetVariable(interp, argv[3 + i], outVec[i]) != JIM_OK)
-                    goto err;
-            }
-        }
-        Jim_FreeNewObj(interp, listPtr);
-        Jim_SetResult(interp, Jim_NewIntObj(interp, count));
-    } else {
-        if (listPtr == (Jim_Obj*)EOF) {
-            Jim_SetResult(interp, Jim_NewListObj(interp, 0, 0));
-            return JIM_OK;
-        }
-        Jim_SetResult(interp, listPtr);
-    }
-    return JIM_OK;
-err:
-    Jim_FreeNewObj(interp, listPtr);
-    return JIM_ERR;
-}
+            if (Jim_Len
 
 /* [error] */
 static int Jim_ErrorCoreCommand(Jim_Interp *interp, int argc,
diff --git a/src/helper/jim.c b/src/helper/jim.c
index 8b0014f..8538954 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;

-----------------------------------------------------------------------

Summary of changes:
 src/helper/{jim.c => #jim.c#} |   29 +++++------------------------
 src/helper/jim.c              |    6 +++---
 2 files changed, 8 insertions(+), 27 deletions(-)
 copy src/helper/{jim.c => #jim.c#} (99%)


hooks/post-receive
-- 
Main OpenOCD repository