[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-729-g330733e

[Zach W. <zw...@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  330733eadf76ea87ee8714ed7958f174b1be21db (commit)
      from  892604bc7e6b332cf3b0bf6c2586cbd0f54ec8ef (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 330733eadf76ea87ee8714ed7958f174b1be21db
Author: Zachary T Welch <zw...@su...>
Date:   Sat Nov 28 16:29:41 2009 -0800

    improve command prohibition error report
    
    Ensures that the correct information gets displayed, depending on the
    mode of the command being denied.  Fixes misreporting all commands as
    needing to run "before 'init'".

diff --git a/src/helper/command.c b/src/helper/command.c
index 9b9c5ec..dcad6a1 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -565,8 +565,16 @@ static int run_command(struct command_context *context,
 {
 	if (!command_can_run(context, c))
 	{
-		/* Config commands can not run after the config stage */
-		LOG_ERROR("The '%s' command must be used before 'init'.", c->name);
+		/* Many commands may be run only before/after 'init' */
+		const char *when;
+		switch (c->mode) {
+		case COMMAND_CONFIG: when = "before"; break;
+		case COMMAND_EXEC: when = "after"; break;
+		// handle the impossible with humor; it guarantees a bug report!
+		default: when = "if Cthulhu is summoned by"; break;
+		}
+		LOG_ERROR("The '%s' command must be used %s 'init'.",
+				c->name, when);
 		return ERROR_FAIL;
 	}
 

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

Summary of changes:
 src/helper/command.c |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository