From patchwork Thu Nov 25 07:05:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 72990 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3862DB70AF for ; Thu, 25 Nov 2010 18:06:37 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 538152813B; Thu, 25 Nov 2010 08:06:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zTCzdBroufXh; Thu, 25 Nov 2010 08:06:28 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 484E528140; Thu, 25 Nov 2010 08:06:23 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1985128137 for ; Thu, 25 Nov 2010 08:06:17 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RMmzt6Y-guzc for ; Thu, 25 Nov 2010 08:06:15 +0100 (CET) X-Greylist: delayed 68267 seconds by postgrey-1.27 at theia; Thu, 25 Nov 2010 08:06:13 CET X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.171]) by theia.denx.de (Postfix) with ESMTP id 09EFD2813A for ; Thu, 25 Nov 2010 08:06:13 +0100 (CET) Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0LdZfa-1Od8Ss1FQY-00iuQT; Thu, 25 Nov 2010 08:06:13 +0100 Received: from Lupus.CS.local (unknown [192.168.102.87]) by corscience.de (Postfix) with ESMTP id CC010520A0; Thu, 25 Nov 2010 08:06:08 +0100 (CET) From: Thomas Weber To: u-boot@lists.denx.de Date: Thu, 25 Nov 2010 08:05:28 +0100 Message-Id: <1290668730-26595-2-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1290668730-26595-1-git-send-email-weber@corscience.de> References: <1290668730-26595-1-git-send-email-weber@corscience.de> X-Provags-ID: V02:K0:mdxADtxM6Gz5CWvRl2q3FE+DG8L48gSMhH3GOgoCjPT pEk80776oItyi/7MwhLryTGMBZHeMSoIW9U3Lj8ac94j4uHHfi ru1lPmV8ew0vu5Yim24iTkwANzT1mSYE43W/za2glJ2WuMhcQ+ ucMTb0OD/f8sfKqxlanuYP6anzszocLYlY7IhJ0luIyRue5wsF glyJ6Ud4ZYHGe8NAS0bpQ== Cc: Thomas Weber Subject: [U-Boot] [PATCHv2 1/3] common/cmd_nvedit: Use return value of cmd_usage X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Use the return value of cmd_usage instead of ignoring this and returning a 1. Signed-off-by: Thomas Weber --- common/cmd_nvedit.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 3fd8abc..cd19cc6 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) @@ -857,8 +852,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(