Improve handle_mw_command argument handling:

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

diff --git a/src/target/target.c b/src/target/target.c
index 2163a74c2dfeaa04d9c439390fa4f49c0ca9bf60..c2f479add0fe6818c84d16eebfb3d34e14a8eedb 100644 (file)
--- 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;
        }
 
@@ -1957,7 +1954,11 @@ static int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, c
         * handle breakpoints, not debugging */
        u32 addr = 0;
        if (argc == 1)
-               addr = strtoul(args[0], NULL, 0);
+       {
+               int retval = parse_u32(args[0], &addr);
+               if (ERROR_OK != retval)
+                       return retval;
+       }
 
        return target_resume(target, 0, addr, 1, 0);
 }
@@ -1974,7 +1975,11 @@ static int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, cha
         * handle breakpoints, debugging */
        u32 addr = 0;
        if (argc == 1)
-               addr = strtoul(args[0], NULL, 0);
+       {
+               int retval = parse_u32(args[0], &addr);
+               if (ERROR_OK != retval)
+                       return retval;
+       }
 
        target_t *target = get_current_target(cmd_ctx);
        return target->type->step(target, 0, addr, 1);
@@ -2041,16 +2046,23 @@ static int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char
        default: return ERROR_COMMAND_SYNTAX_ERROR;
        }
 
-       u32 address = strtoul(args[0], NULL, 0);
+       u32 address;
+       int retval = parse_u32(args[0], &address);
+       if (ERROR_OK != retval)
+               return retval;
 
        unsigned count = 1;
        if (argc == 2)
-               count = strtoul(args[1], NULL, 0);
+       {
+               retval = parse_uint(args[1], &count);
+               if (ERROR_OK != retval)
+                       return retval;
+       }
 
        u8 *buffer = calloc(count, size);
 
        target_t *target = get_current_target(cmd_ctx);
-       int retval = target_read_memory(target,
+       retval = target_read_memory(target,
                                address, size, count, buffer);
        if (ERROR_OK == retval)
                handle_md_output(cmd_ctx, target, address, size, count, buffer);
@@ -2062,22 +2074,30 @@ static int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char
 
 static int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
-       u32 address = 0;
-       u32 value = 0;
-       int count = 1;
-       int i;
-       int wordsize;
-       target_t *target = get_current_target(cmd_ctx);
-       u8 value_buf[4];
-
         if ((argc < 2) || (argc > 3))
                return ERROR_COMMAND_SYNTAX_ERROR;
 
-       address = strtoul(args[0], NULL, 0);
-       value = strtoul(args[1], NULL, 0);
+       u32 address;
+       int retval = parse_u32(args[0], &address);
+       if (ERROR_OK != retval)
+               return retval;
+
+       u32 value;
+       retval = parse_u32(args[1], &value);
+       if (ERROR_OK != retval)
+               return retval;
+
+       unsigned count = 1;
        if (argc == 3)
-               count = strtoul(args[2], NULL, 0);
+       {
+               retval = parse_uint(args[2], &count);
+               if (ERROR_OK != retval)
+                       return retval;
+       }
 
+       target_t *target = get_current_target(cmd_ctx);
+       unsigned wordsize;
+       u8 value_buf[4];
        switch (cmd[2])
        {
                case 'w':
@@ -2095,9 +2115,9 @@ static int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char
                default:
                        return ERROR_COMMAND_SYNTAX_ERROR;
        }
-       for (i=0; i<count; i++)
+       for (unsigned i = 0; i < count; i++)
        {
-               int retval = target_write_memory(target,
+               retval = target_write_memory(target,
                                address + i * wordsize, wordsize, 1, value_buf);
                if (ERROR_OK != retval)
                        return retval;