Cleanup and improve handle_halt_command:

[openocd.git] / src / target / target.c

diff --git a/src/target/target.c b/src/target/target.c
index 13c0842ff9ce791a08c2b5b3c01f1889564118b0..a7d2a6d9620803215231592db2019919ece440f2 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -1822,21 +1822,23 @@ static int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, cha
 
 static int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       int ms = 5000;
+       if (argc > 1)
+               return ERROR_COMMAND_SYNTAX_ERROR;
 
-       if (argc > 0)
+       unsigned ms = 5000;
+       if (1 == argc)
        {
-               char *end;
-
-               ms = strtoul(args[0], &end, 0) * 1000;
-               if (*end)
+               int retval = parse_uint(args[0], &ms);
+               if (ERROR_OK != retval)
                {
                        command_print(cmd_ctx, "usage: %s [seconds]", cmd);
-                       return ERROR_OK;
+                       return ERROR_COMMAND_SYNTAX_ERROR;
                }
+               // convert seconds (given) to milliseconds (needed)
+               ms *= 1000;
        }
-       target_t *target = get_current_target(cmd_ctx);
 
+       target_t *target = get_current_target(cmd_ctx);
        return target_wait_state(target, TARGET_HALTED, ms);
 }
 
@@ -1887,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;
        }