Simplify handle_resume_command:

- Eliminate redundant calls to target_resume with addr temp variable.
- Place variables at location of first use.
- Fix minor whitespace issues.


git-svn-id: svn://svn.berlios.de/openocd/trunk@2191 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
zwelch 2009-06-11 11:42:33 +00:00
parent 78cf92166a
commit e4850d7159
1 changed files with 11 additions and 12 deletions

View File

@ -1931,21 +1931,20 @@ static int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, ch
static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
{ {
int retval; if (argc > 1)
target_t *target = get_current_target(cmd_ctx); return ERROR_COMMAND_SYNTAX_ERROR;
target_t *target = get_current_target(cmd_ctx);
target_handle_event(target, TARGET_EVENT_OLD_pre_resume); target_handle_event(target, TARGET_EVENT_OLD_pre_resume);
if (argc == 0) /* with no args, resume from current pc, addr = 0,
retval = target_resume(target, 1, 0, 1, 0); /* current pc, addr = 0, handle breakpoints, not debugging */ * with one arguments, addr = args[0],
else if (argc == 1) * handle breakpoints, not debugging */
retval = target_resume(target, 0, strtoul(args[0], NULL, 0), 1, 0); /* addr = args[0], handle breakpoints, not debugging */ u32 addr = 0;
else if (argc == 1)
{ addr = strtoul(args[0], NULL, 0);
retval = ERROR_COMMAND_SYNTAX_ERROR;
}
return retval; return target_resume(target, 0, addr, 1, 0);
} }
static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)