From 43e1ed244fdd58804c2453b51e636d3a755a7c5d Mon Sep 17 00:00:00 2001 From: zwelch Date: Sun, 7 Jun 2009 03:48:21 +0000 Subject: [PATCH] Clean up handle_endstate_command(): - Merge declaration of state with first use. - Unindent and remove unnecessary 'else' block. git-svn-id: svn://svn.berlios.de/openocd/trunk@2077 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/jtag/jtag.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c index cfffe702..af063433 100644 --- a/src/jtag/jtag.c +++ b/src/jtag/jtag.c @@ -2185,23 +2185,20 @@ static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd, static int handle_endstate_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - tap_state_t state; - if (argc < 1) - { return ERROR_COMMAND_SYNTAX_ERROR; - } - else + + tap_state_t state = tap_state_by_name(args[0]); + if (state < 0) { - state = tap_state_by_name( args[0] ); - if( state < 0 ){ - command_print( cmd_ctx, "Invalid state name: %s\n", args[0] ); - return ERROR_COMMAND_SYNTAX_ERROR; - } - jtag_set_end_state(state); - jtag_execute_queue(); + command_print( cmd_ctx, "Invalid state name: %s\n", args[0] ); + return ERROR_COMMAND_SYNTAX_ERROR; } - command_print(cmd_ctx, "current endstate: %s", tap_state_name(cmd_queue_end_state)); + jtag_set_end_state(state); + jtag_execute_queue(); + + command_print(cmd_ctx, "current endstate: %s", + tap_state_name(cmd_queue_end_state)); return ERROR_OK; } -- 2.39.5