Improve trace command argument parsing.

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

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index eb37add3d2e39bb13b14cb84bf2a1dc6254e6934..a1d1cbc6fc29631961f901a390952c224ca85f26 100644 (file)
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -1199,7 +1199,7 @@ cortex_m3_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
        unsigned mask;
 
        for (mask = 0; mask < 16; mask++) {
-               if ((1 << mask) == watchpoint->length)
+               if ((1u << mask) == watchpoint->length)
                        break;
        }
        if (mask == 16) {
@@ -1830,14 +1830,10 @@ handle_cortex_m3_disassemble_command(struct command_context_s *cmd_ctx,
        errno = 0;
        switch (argc) {
        case 2:
-               count = strtoul(args[1], NULL, 0);
-               if (errno)
-                       return ERROR_FAIL;
+               COMMAND_PARSE_NUMBER(ulong, args[1], count);
                /* FALL THROUGH */
        case 1:
-               address = strtoul(args[0], NULL, 0);
-               if (errno)
-                       return ERROR_FAIL;
+               COMMAND_PARSE_NUMBER(u32, args[0], address);
                break;
        default:
                command_print(cmd_ctx,