diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-21 19:23:35 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-05-21 19:23:35 +0000 |
| commit | 3642616171e9b14da61d5120733240b00f3698b2 (patch) | |
| tree | 7fe21e730d0a1b9119cef465340743c8cb02cc02 /src | |
| parent | c3b9604658358f839b1cbfaec785b3ab53a79ae8 (diff) | |
| download | openocd+libswd-3642616171e9b14da61d5120733240b00f3698b2.tar.gz openocd+libswd-3642616171e9b14da61d5120733240b00f3698b2.tar.bz2 openocd+libswd-3642616171e9b14da61d5120733240b00f3698b2.tar.xz openocd+libswd-3642616171e9b14da61d5120733240b00f3698b2.zip | |
- remove error message on shutdown
git-svn-id: svn://svn.berlios.de/openocd/trunk@672 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/command.c | 8 | ||||
| -rw-r--r-- | src/server/server.c | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/helper/command.c b/src/helper/command.c index 0a120b10..3cf531b7 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -374,7 +374,12 @@ int find_and_run_command(command_context_t *context, command_t *commands, char * { command_print(context, "Syntax error:"); command_print_help_line(context, c, 0); - } else if (retval != ERROR_OK) + } + else if (retval == ERROR_COMMAND_CLOSE_CONNECTION) + { + /* just fall through for a shutdown request */ + } + else if (retval != ERROR_OK) { /* we do not print out an error message because the command *should* * have printed out an error @@ -558,7 +563,6 @@ int command_print_help(command_context_t* context, char* name, char** args, int return command_print_help_match(context, context->commands, name, args, argc); } - void command_set_output_handler(command_context_t* context, int (*output_handler)(struct command_context_s *context, char* line), void *priv) { context->output_handler = output_handler; diff --git a/src/server/server.c b/src/server/server.c index 21a8ebab..fb003624 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -462,7 +462,6 @@ int server_init() signal(SIGBREAK, sig_handler); signal(SIGABRT, sig_handler); #endif - return ERROR_OK; } @@ -494,5 +493,3 @@ int handle_shutdown_command(struct command_context_s *cmd_ctx, char *cmd, char * return ERROR_COMMAND_CLOSE_CONNECTION; } - - |