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.

git-svn-id: svn://svn.berlios.de/openocd/trunk@2114 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 91430b6e7f0c53e5ecd73a39e74c856d9b0a001f..3011adfed3fcd74e0dda7d3a7313a0ccdcee54a6 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -2203,33 +2203,27 @@ static int handle_jtag_khz_command(struct command_context_s *cmd_ctx, char *cmd,
 
 }
 
-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;