From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Mon, 8 Jun 2009 10:54:52 +0000 (+0000)
Subject: Update JTAG reset delay command handlers:
X-Git-Tag: v0.2.0~401
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7c4e1ec9370d6c053ad93967793383683175ed2;p=openocd

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 113c9610..ec5578b7 100644
--- 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;
 }