From: David Brownell Date: Tue, 5 Jan 2010 21:32:39 +0000 (-0800) Subject: don't require 'openocd.cfg' to start X-Git-Tag: v0.4.0-rc2~141 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=844b5eb49d7fd4afa4f0309ce47f29d99886a2f7;p=openocd 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 007246c5..eedd8a1c 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;