Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-25 22:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

common/cmd_nvedit: Use return value of cmd_usage

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

Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Thomas Weber 2010-11-25 08:05:28 +01:00 committed by Wolfgang Denk
parent 7013c06124
commit 0d302af0bb
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
common/cmd_nvedit.c
View file

@ -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
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
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[])
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(