summaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2010-01-05 13:32:39 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2010-01-05 13:32:39 -0800
commit844b5eb49d7fd4afa4f0309ce47f29d99886a2f7 (patch)
tree0312b4226ba6768d74163fe7fc439221549ccb06 /src/helper
parentfccb812f829e55940e26466c4cda8c25765d4f6c (diff)
downloadopenocd_libswd-844b5eb49d7fd4afa4f0309ce47f29d99886a2f7.tar.gz
openocd_libswd-844b5eb49d7fd4afa4f0309ce47f29d99886a2f7.tar.bz2
openocd_libswd-844b5eb49d7fd4afa4f0309ce47f29d99886a2f7.tar.xz
openocd_libswd-844b5eb49d7fd4afa4f0309ce47f29d99886a2f7.zip
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.
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/configuration.c6
1 files changed, 4 insertions, 2 deletions
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;