From: Dean Glazeski Date: Sat, 14 Nov 2009 18:39:08 +0000 (-0600) Subject: Invalid command syntax errors with MWW. X-Git-Tag: v0.4.0-rc1~605 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c93ae60bce40b196cb5594e8e4723f3d567ff22e;p=openocd Invalid command syntax errors with MWW. This fixes an issue due to the new command handler syntax caused by the mw handler playing with the args pointer before using the CMD_NAME macro. Fix is to move this call above the lines changing args. --- diff --git a/src/target/target.c b/src/target/target.c index cc8d500f..6ecf16a1 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -2308,6 +2308,7 @@ COMMAND_HANDLER(handle_mw_command) bool physical=strcmp(args[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) { argc--; @@ -2333,7 +2334,7 @@ COMMAND_HANDLER(handle_mw_command) struct target *target = get_current_target(cmd_ctx); unsigned wordsize; uint8_t value_buf[4]; - switch (CMD_NAME[2]) + switch (cmd_name[6]) { case 'w': wordsize = 4;