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.
This commit is contained in:
Zachary T Welch
2009-11-10 02:43:11 -08:00
parent e09d8938f5
commit 9741e126fd
3 changed files with 28 additions and 28 deletions

View File

@@ -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));