Update JTAG reset delay command handlers:

- Fixes for error handling:
  - Return a syntax error instead of calling exit(-1).
  - Return error when more than one argument is provided too.
- Remove useless braces and indent after the if/return statements.
- Wrap function arguments to fit in 80 columns.

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

diff --git a/src/jtag/jtag.c b/src/jtag/jtag.c
index 113c9610f24edb6b2780e0dc9ba6cde460d783a3..ec5578b745f3e1be153dde269051aaa270cd0b18 100644 (file)
--- a/src/jtag/jtag.c
+++ b/src/jtag/jtag.c
@@ -2112,33 +2112,27 @@ next:
        return ERROR_OK;
 }
 
-static int handle_jtag_nsrst_delay_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_jtag_nsrst_delay_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc)
 {
-       if (argc < 1)
+       if (argc != 1)
        {
-               LOG_ERROR("jtag_nsrst_delay <ms> command takes one required argument");
-               exit(-1);
-       }
-       else
-       {
-               jtag_set_nsrst_delay(strtoul(args[0], NULL, 0));
+               LOG_ERROR("jtag_nsrst_delay <ms> -- command requires one argument");
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-
+       jtag_set_nsrst_delay(strtoul(args[0], NULL, 0));
        return ERROR_OK;
 }
 
-static int handle_jtag_ntrst_delay_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+static int handle_jtag_ntrst_delay_command(struct command_context_s *cmd_ctx,
+               char *cmd, char **args, int argc)
 {
-       if (argc < 1)
+       if (argc != 1)
        {
-               LOG_ERROR("jtag_ntrst_delay <ms> command takes one required argument");
-               exit(-1);
-       }
-       else
-       {
-               jtag_set_ntrst_delay(strtoul(args[0], NULL, 0));
+               LOG_ERROR("jtag_ntrst_delay <ms> -- command requires one argument");
+               return ERROR_COMMAND_SYNTAX_ERROR;
        }
-
+       jtag_set_ntrst_delay(strtoul(args[0], NULL, 0));
        return ERROR_OK;
 }