Skip to content
Snippets Groups Projects
Commit 0d302af0 authored by Thomas Weber's avatar Thomas Weber Committed by Wolfgang Denk
Browse files

common/cmd_nvedit: Use return value of cmd_usage


Use the return value of cmd_usage instead of ignoring this
and returning a 1.

Signed-off-by: default avatarThomas Weber <weber@corscience.de>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 7013c061
No related branches found
No related tags found
No related merge requests found
...@@ -545,8 +545,7 @@ int envmatch (uchar *s1, int i2) ...@@ -545,8 +545,7 @@ int envmatch (uchar *s1, int i2)
static int do_env_default(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) static int do_env_default(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
{ {
if ((argc != 2) || (strcmp(argv[1], "-f") != 0)) { if ((argc != 2) || (strcmp(argv[1], "-f") != 0)) {
cmd_usage(cmdtp); return cmd_usage(cmdtp);
return 1;
} }
set_default_env("## Resetting to default environment\n"); set_default_env("## Resetting to default environment\n");
return 0; return 0;
...@@ -633,15 +632,13 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv ...@@ -633,15 +632,13 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
sep = '\n'; sep = '\n';
break; break;
default: default:
cmd_usage(cmdtp); return cmd_usage(cmdtp);
return 1;
} }
} }
} }
if (argc < 1) { if (argc < 1) {
cmd_usage(cmdtp); return cmd_usage(cmdtp);
return 1;
} }
addr = (char *)simple_strtoul(argv[0], NULL, 16); addr = (char *)simple_strtoul(argv[0], NULL, 16);
...@@ -744,15 +741,13 @@ static int do_env_import(cmd_tbl_t * cmdtp, int flag, int argc, char * const arg ...@@ -744,15 +741,13 @@ static int do_env_import(cmd_tbl_t * cmdtp, int flag, int argc, char * const arg
del = 1; del = 1;
break; break;
default: default:
cmd_usage(cmdtp); return cmd_usage(cmdtp);
return 1;
} }
} }
} }
if (argc < 1) { if (argc < 1) {
cmd_usage(cmdtp); return cmd_usage(cmdtp);
return 1;
} }
if (!fmt) if (!fmt)
...@@ -860,8 +855,7 @@ static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ...@@ -860,8 +855,7 @@ static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (cp) if (cp)
return cp->cmd(cmdtp, flag, argc, argv); return cp->cmd(cmdtp, flag, argc, argv);
cmd_usage(cmdtp); return cmd_usage(cmdtp);
return 1;
} }
U_BOOT_CMD( U_BOOT_CMD(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment