From: zwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sat, 13 Jun 2009 00:33:11 +0000 (+0000)
Subject: Cleanup and improve handle_halt_command:
X-Git-Tag: v0.2.0~287
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5d0cdf4d947384844d01130a7cd5749296e853e0;p=openocd

Cleanup and improve handle_halt_command:
- Make argument check use parse_uint to ensure value parses properly.
- Move variable declarations to location of first use.


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

diff --git a/src/target/target.c b/src/target/target.c
index 2163a74c..a7d2a6d9 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1889,23 +1889,20 @@ int target_wait_state(target_t *target, enum target_state state, int ms)
 
 static int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-	int retval;
-	target_t *target = get_current_target(cmd_ctx);
-
 	LOG_DEBUG("-");
 
-	if ((retval = target_halt(target)) != ERROR_OK)
-	{
+	target_t *target = get_current_target(cmd_ctx);
+	int retval = target_halt(target);
+	if (ERROR_OK != retval)
 		return retval;
-	}
 
 	if (argc == 1)
 	{
-		int wait;
-		char *end;
-
-		wait = strtoul(args[0], &end, 0);
-		if (!*end && !wait)
+		unsigned wait;
+		retval = parse_uint(args[0], &wait);
+		if (ERROR_OK != retval)
+			return ERROR_COMMAND_SYNTAX_ERROR;
+		if (!wait)
 			return ERROR_OK;
 	}