From 59f32cbe53ccd8725e01968fcbc716cc5768a36b Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Wed, 18 Nov 2009 03:34:52 -0800 Subject: [PATCH] fix regression in md/mw commands The recent migration broke them, the fixes broken them in a new way, but this should restore them to working order. Eliminates the temporary variable, as the CMD_NAME macro can once again be use in routines that increment CMD_ARGV without nasty side-effects. --- src/target/target.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/target/target.c b/src/target/target.c index bf83da0077..98e7a40346 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2248,8 +2248,7 @@ COMMAND_HANDLER(handle_md_command) return ERROR_COMMAND_SYNTAX_ERROR; unsigned size = 0; - const char *cmd_name = CMD_NAME; - switch (cmd_name[6]) { + switch (CMD_NAME[2]) { case 'w': size = 4; break; case 'h': size = 2; break; case 'b': size = 1; break; @@ -2301,7 +2300,6 @@ COMMAND_HANDLER(handle_mw_command) bool physical=strcmp(CMD_ARGV[0], "phys")==0; int (*fn)(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer); - const char *cmd_name = CMD_NAME; if (physical) { CMD_ARGC--; @@ -2327,7 +2325,7 @@ COMMAND_HANDLER(handle_mw_command) struct target *target = get_current_target(CMD_CTX); unsigned wordsize; uint8_t value_buf[4]; - switch (cmd_name[6]) + switch (CMD_NAME[2]) { case 'w': wordsize = 4; -- 2.30.2