imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove error message on shutdown

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@672 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
ntfreak 2008-05-21 19:23:35 +00:00
parent c3b9604658
commit 3642616171
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/helper/command.c
View File

@ -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;

3
src/server/server.c
View File

@ -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;
}