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

[David B. <dbr...@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  844b5eb49d7fd4afa4f0309ce47f29d99886a2f7 (commit)
      from  fccb812f829e55940e26466c4cda8c25765d4f6c (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 844b5eb49d7fd4afa4f0309ce47f29d99886a2f7
Author: David Brownell <dbr...@us...>
Date:   Tue Jan 5 13:32:39 2010 -0800

    don't require 'openocd.cfg' to start
    
    Starting the daemon with with just a bare "openocd" I saw:
    
    	Can't find openocd.cfg
    
    That's not an error; don't treat it as if it were.  There may
    be an error later -- like, "no interface set up" -- but let
    messages only report real errors, not fake ones.

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 007246c..eedd8a1 100644
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -115,8 +115,10 @@ int parse_config_file(struct command_context *cmd_ctx)
 	int retval;
 	char **cfg;
 
-	if (!config_file_names)
-		add_config_command ("script openocd.cfg");
+	if (!config_file_names) {
+		command_run_line(cmd_ctx, "script openocd.cfg");
+		return ERROR_OK;
+	}
 
 	cfg = config_file_names;
 

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

Summary of changes:
 src/helper/configuration.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository