summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Weber <weber@corscience.de>2010-11-25 08:05:28 +0100
committerWolfgang Denk <wd@denx.de>2010-11-27 23:35:13 +0100
commit0d302af0bb7e0be40d960bd2d8ee0a91dc9e2bbf (patch)
treef319f4cf4b056d9ae06ac72ea377c757b1b08f85
parent7013c06124e9760f75ef194d429ed29fba843eb9 (diff)
downloadu-boot-imx-0d302af0bb7e0be40d960bd2d8ee0a91dc9e2bbf.zip
u-boot-imx-0d302af0bb7e0be40d960bd2d8ee0a91dc9e2bbf.tar.gz
u-boot-imx-0d302af0bb7e0be40d960bd2d8ee0a91dc9e2bbf.tar.bz2
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: Thomas Weber <weber@corscience.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r--common/cmd_nvedit.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 52c5e7c..dcc93c1 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -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[])
{
if ((argc != 2) || (strcmp(argv[1], "-f") != 0)) {
- cmd_usage(cmdtp);
- return 1;
+ return cmd_usage(cmdtp);
}
set_default_env("## Resetting to default environment\n");
return 0;
@@ -633,15 +632,13 @@ static int do_env_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv
sep = '\n';
break;
default:
- cmd_usage(cmdtp);
- return 1;
+ return cmd_usage(cmdtp);
}
}
}
if (argc < 1) {
- cmd_usage(cmdtp);
- return 1;
+ return cmd_usage(cmdtp);
}
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;
break;
default:
- cmd_usage(cmdtp);
- return 1;
+ return cmd_usage(cmdtp);
}
}
}
if (argc < 1) {
- cmd_usage(cmdtp);
- return 1;
+ return cmd_usage(cmdtp);
}
if (!fmt)
@@ -860,8 +855,7 @@ static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (cp)
return cp->cmd(cmdtp, flag, argc, argv);
- cmd_usage(cmdtp);
- return 1;
+ return cmd_usage(cmdtp);
}
U_BOOT_CMD(