interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup and improve handle_halt_command: 

- Make argument check use parse_uint to ensure value parses properly.
- Move variable declarations to location of first use.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2228 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-13 00:33:11 +00:00
parent fad8521a87
commit 5d0cdf4d94
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/target/target.c
View File

@ -1889,23 +1889,20 @@ int target_wait_state(target_t *target, enum target_state state, int ms)
static int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
int retval;
target_t *target = get_current_target(cmd_ctx);
LOG_DEBUG("-"); LOG_DEBUG("-");
if ((retval = target_halt(target)) != ERROR_OK) target_t *target = get_current_target(cmd_ctx);
{ int retval = target_halt(target);
if (ERROR_OK != retval)
return retval; return retval;
}
if (argc == 1) if (argc == 1)
{ {
int wait; unsigned wait;
char *end; retval = parse_uint(args[0], &wait);
if (ERROR_OK != retval)
wait = strtoul(args[0], &end, 0); return ERROR_COMMAND_SYNTAX_ERROR;
if (!*end && !wait) if (!wait)
return ERROR_OK; return ERROR_OK;
} }