[Openocd-svn] r2077 - trunk/src/jtag

[<zw...@ma...>]

Author: zwelch
Date: 2009-06-07 05:48:21 +0200 (Sun, 07 Jun 2009)
New Revision: 2077

Modified:
   trunk/src/jtag/jtag.c
Log:
Clean up handle_endstate_command():
- Merge declaration of state with first use.
- Unindent and remove unnecessary 'else' block.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-05 12:58:39 UTC (rev 2076)
+++ trunk/src/jtag/jtag.c	2009-06-07 03:48:21 UTC (rev 2077)
@@ -2185,24 +2185,21 @@
 
 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;
+
+	tap_state_t 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;
 	}
-	else
-	{
-		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, "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;
 }