From: Zachary T Welch Date: Tue, 10 Nov 2009 10:43:11 +0000 (-0800) Subject: change argv to args in command handlers X-Git-Tag: v0.4.0-rc1~834 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=9741e126fd854815460296ad47d027129c7f17bf change argv to args in command handlers Subsequent patches expect all command handlers to use a uniform parameter naming scheme. In the entire tree, these two files used standard 'argv' instead of our non-standard 'args'. This patch opts to reduces the noise required to unify the command handlers, using dominant 'args' form. A future patch may be used to convert us back to the standard argv, but that requires coordination with all developers to minimize disruptions. --- diff --git a/src/flash/at91sam3.c b/src/flash/at91sam3.c index 7d3d82c121..714e8b8b88 100644 --- a/src/flash/at91sam3.c +++ b/src/flash/at91sam3.c @@ -2267,7 +2267,7 @@ sam3_write(struct flash_bank_s *bank, } static int -sam3_handle_info_command(struct command_context_s *cmd_ctx, char *cmd, char **argv, int argc) +sam3_handle_info_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { struct sam3_chip *pChip; void *vp; @@ -2344,7 +2344,7 @@ sam3_handle_info_command(struct command_context_s *cmd_ctx, char *cmd, char **ar } static int -sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **argv, int argc) +sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { unsigned x,v; int r,who; @@ -2387,17 +2387,17 @@ sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **a who = -1; break; case 2: - if ((0 == strcmp(argv[0], "show")) && (0 == strcmp(argv[1], "all"))) { + if ((0 == strcmp(args[0], "show")) && (0 == strcmp(args[1], "all"))) { who = -1; } else { uint32_t v32; - COMMAND_PARSE_NUMBER(u32, argv[1], v32); + COMMAND_PARSE_NUMBER(u32, args[1], v32); who = v32; } break; } - if (0 == strcmp("show", argv[0])) { + if (0 == strcmp("show", args[0])) { if (who == -1) { showall: r = ERROR_OK; @@ -2425,20 +2425,20 @@ sam3_handle_gpnvm_command(struct command_context_s *cmd_ctx, char *cmd, char **a return ERROR_COMMAND_SYNTAX_ERROR; } - if (0 == strcmp("set", argv[0])) { + if (0 == strcmp("set", args[0])) { r = FLASHD_SetGPNVM(&(pChip->details.bank[0]), who); - } else if ((0 == strcmp("clr", argv[0])) || - (0 == strcmp("clear", argv[0]))) { // quietly accept both + } else if ((0 == strcmp("clr", args[0])) || + (0 == strcmp("clear", args[0]))) { // quietly accept both r = FLASHD_ClrGPNVM(&(pChip->details.bank[0]), who); } else { - command_print(cmd_ctx, "Unkown command: %s", argv[0]); + command_print(cmd_ctx, "Unkown command: %s", args[0]); r = ERROR_COMMAND_SYNTAX_ERROR; } return r; } static int -sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char **argv, int argc) +sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { struct sam3_chip *pChip; @@ -2456,7 +2456,7 @@ sam3_handle_slowclk_command(struct command_context_s *cmd_ctx, char *cmd, char * { // set uint32_t v; - COMMAND_PARSE_NUMBER(u32, argv[0], v); + COMMAND_PARSE_NUMBER(u32, args[0], v); if (v > 200000) { // absurd slow clock of 200Khz? command_print(cmd_ctx,"Absurd/illegal slow clock freq: %d\n", (int)(v)); diff --git a/src/flash/davinci_nand.c b/src/flash/davinci_nand.c index b6210b8fdf..6ecc60a25d 100644 --- a/src/flash/davinci_nand.c +++ b/src/flash/davinci_nand.c @@ -630,7 +630,7 @@ static int davinci_read_page_ecc4infix(struct nand_device_s *nand, uint32_t page } static int davinci_nand_device_command(struct command_context_s *cmd_ctx, - char *cmd, char **argv, int argc, + char *cmd, char **args, int argc, struct nand_device_s *nand) { struct davinci_nand *info; @@ -650,36 +650,36 @@ static int davinci_nand_device_command(struct command_context_s *cmd_ctx, if (argc < 5) { LOG_ERROR("parameters: %s target " "chip_addr hwecc_mode aemif_addr", - argv[0]); + args[0]); goto fail; } - target = get_target(argv[1]); + target = get_target(args[1]); if (!target) { - LOG_ERROR("invalid target %s", argv[1]); + LOG_ERROR("invalid target %s", args[1]); goto fail; } - COMMAND_PARSE_NUMBER(ulong, argv[2], chip); + COMMAND_PARSE_NUMBER(ulong, args[2], chip); if (chip == 0) { - LOG_ERROR("Invalid NAND chip address %s", argv[2]); + LOG_ERROR("Invalid NAND chip address %s", args[2]); goto fail; } - if (strcmp(argv[3], "hwecc1") == 0) + if (strcmp(args[3], "hwecc1") == 0) eccmode = HWECC1; - else if (strcmp(argv[3], "hwecc4") == 0) + else if (strcmp(args[3], "hwecc4") == 0) eccmode = HWECC4; - else if (strcmp(argv[3], "hwecc4_infix") == 0) + else if (strcmp(args[3], "hwecc4_infix") == 0) eccmode = HWECC4_INFIX; else { - LOG_ERROR("Invalid ecc mode %s", argv[3]); + LOG_ERROR("Invalid ecc mode %s", args[3]); goto fail; } - COMMAND_PARSE_NUMBER(ulong, argv[4], aemif); + COMMAND_PARSE_NUMBER(ulong, args[4], aemif); if (aemif == 0) { - LOG_ERROR("Invalid AEMIF controller address %s", argv[4]); + LOG_ERROR("Invalid AEMIF controller address %s", args[4]); goto fail; } diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c index 12f0eec155..6c95b4ea54 100644 --- a/src/target/cortex_m3.c +++ b/src/target/cortex_m3.c @@ -1837,7 +1837,7 @@ static const struct { static int handle_cortex_m3_vector_catch_command(struct command_context_s *cmd_ctx, - char *cmd, char **argv, int argc) + char *cmd, char **args, int argc) { target_t *target = get_current_target(cmd_ctx); struct cortex_m3_common_s *cortex_m3 = target_to_cm3(target); @@ -1857,24 +1857,24 @@ handle_cortex_m3_vector_catch_command(struct command_context_s *cmd_ctx, unsigned catch = 0; if (argc == 1) { - if (strcmp(argv[0], "all") == 0) { + if (strcmp(args[0], "all") == 0) { catch = VC_HARDERR | VC_INTERR | VC_BUSERR | VC_STATERR | VC_CHKERR | VC_NOCPERR | VC_MMERR | VC_CORERESET; goto write; - } else if (strcmp(argv[0], "none") == 0) { + } else if (strcmp(args[0], "none") == 0) { goto write; } } while (argc-- > 0) { for (i = 0; i < ARRAY_SIZE(vec_ids); i++) { - if (strcmp(argv[argc], vec_ids[i].name) != 0) + if (strcmp(args[argc], vec_ids[i].name) != 0) continue; catch |= vec_ids[i].mask; break; } if (i == ARRAY_SIZE(vec_ids)) { - LOG_ERROR("No CM3 vector '%s'", argv[argc]); + LOG_ERROR("No CM3 vector '%s'", args[argc]); return ERROR_INVALID_ARGUMENTS; } }