diff mbox series

[U-Boot,1/4] cmd: nvedit: rename flags in do_env_default

Message ID 20180624161657.32632-2-yaniv.levinsky@compulab.co.il
State Accepted
Commit 30091494eba7ddd788f0beaec04a986c3ba4f193
Delegated to: Tom Rini
Headers show
Series fix propagation of flags from do_env_default() | expand

Commit Message

Yaniv Levinsky June 24, 2018, 4:16 p.m. UTC 
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(-)

Comments

Tom Rini July 20, 2018, 12:35 p.m. UTC | #1 
On Sun, Jun 24, 2018 at 07:16:54PM +0300, Yaniv Levinsky wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox series

Patch

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