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

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

Author: zwelch
Date: 2009-06-08 12:55:36 +0200 (Mon, 08 Jun 2009)
New Revision: 2114

Modified:
   trunk/src/jtag/jtag.c
Log:
Clean up handle_jtag_reset_command:
- Make command require exactly two arguments; do not allow more than two.
- Move temporary variable declarations closer to point of first use.
- Remove superfluous braces around single statments.
- Wrap to 80 column width.


Modified: trunk/src/jtag/jtag.c
===================================================================
--- trunk/src/jtag/jtag.c	2009-06-08 10:55:24 UTC (rev 2113)
+++ trunk/src/jtag/jtag.c	2009-06-08 10:55:36 UTC (rev 2114)
@@ -2203,33 +2203,27 @@
 
 }
 
-static int handle_jtag_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_jtag_reset_command(struct command_context_s *cmd_ctx,
+		char *cmd, char **args, int argc)
 {
-	int trst = -1;
-	int srst = -1;
-
-	if (argc < 2)
-	{
+	if (argc != 2)
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
+	int trst = -1;
 	if (args[0][0] == '1')
 		trst = 1;
 	else if (args[0][0] == '0')
 		trst = 0;
 	else
-	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
+	int srst = -1;
 	if (args[1][0] == '1')
 		srst = 1;
 	else if (args[1][0] == '0')
 		srst = 0;
 	else
-	{
 		return ERROR_COMMAND_SYNTAX_ERROR;
-	}
 
 	if (jtag_interface_init(cmd_ctx) != ERROR_OK)
 		return ERROR_JTAG_INIT_FAILED;