[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-rc1-94-gfb71a0a

[Ø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  fb71a0a0dddf68fa3f266aab5e35409773acc567 (commit)
       via  6d8604de37855da6e9acf79adbb488788bdc9917 (commit)
      from  c74ca40e09baebe8b86b1a77ad343f7b8ebde5d6 (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 fb71a0a0dddf68fa3f266aab5e35409773acc567
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Jan 11 12:54:49 2010 +0100

    reset: better error messages
    
    Use correct tcl syntax to throw exception.
    
    the syntax is "return -code error" not "return -error"
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index b597b84..d68417e 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -41,7 +41,7 @@ proc ocd_process_reset_inner { MODE } {
 		set halt 0;
 	}
 	if { $halt < 0 } {
-		return -error "Invalid mode: $MODE, must be one of: halt, init, or run";
+		return -code error "Invalid mode: $MODE, must be one of: halt, init, or run";
 	}
 
 	# Target event handlers *might* change which TAPs are enabled
@@ -119,7 +119,7 @@ proc ocd_process_reset_inner { MODE } {
 			set s [$t curstate]
 
 			if { 0 != [string compare $s "halted" ] } {
-				return -error [format "TARGET: %s - Not halted" $t]
+				return -code error [format "TARGET: %s - Not halted" $t]
 			}
 		}
 	}

commit 6d8604de37855da6e9acf79adbb488788bdc9917
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Jan 11 12:53:55 2010 +0100

    commands: make error messages a bit more terse
    
    we don't need to know the build path of command.c when
    reading normal user level error messages.
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/helper/command.c b/src/helper/command.c
index 568596d..cf66f8a 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -349,7 +349,7 @@ static int register_command_handler(struct command_context *cmd_ctx,
 	if (NULL == override_name)
 		return JIM_ERR;
 
-	retval = Jim_Eval_Named(interp, override_name, __FILE__, __LINE__);
+	retval = Jim_Eval_Named(interp, override_name, __THIS__FILE__ , __LINE__);
 	free((void *)override_name);
 
 	return retval;

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

Summary of changes:
 src/helper/command.c   |    2 +-
 src/target/startup.tcl |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository