The naming convention for flags in nvedit.c is: * The hashtable flag (defined in search.h) is named "env_flag" * The command flag argument (defined in command.h) is named "flag"
This convention is kept in functions like do_env_print(), do_env_set() and do_env_delete(), but not in do_env_default().
Rename the hashtable flag in do_env_default() from "flag" to "env_flag". Rename the command flag in do_env_default() from "__flag" to "flag".
No functional change.
Signed-off-by: Yaniv Levinsky yaniv.levinsky@compulab.co.il Reviewed-by: Igor Grinberg grinberg@compulab.co.il --- cmd/nvedit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/nvedit.c b/cmd/nvedit.c index ddc888a4fd..d456d2fc9b 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -777,10 +777,10 @@ int envmatch(uchar *s1, int i2) }
#ifndef CONFIG_SPL_BUILD -static int do_env_default(cmd_tbl_t *cmdtp, int __flag, +static int do_env_default(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int all = 0, flag = 0; + int all = 0, env_flag = 0;
debug("Initial value for argc=%d\n", argc); while (--argc > 0 && **++argv == '-') { @@ -792,7 +792,7 @@ static int do_env_default(cmd_tbl_t *cmdtp, int __flag, all = 1; break; case 'f': /* force */ - flag |= H_FORCE; + env_flag |= H_FORCE; break; default: return cmd_usage(cmdtp);