From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 0AA1B20986ACF for ; Fri, 13 Jul 2018 02:09:02 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jul 2018 02:09:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,347,1526367600"; d="scan'208";a="57367758" Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.158.46]) by orsmga006.jf.intel.com with ESMTP; 13 Jul 2018 02:08:55 -0700 From: Star Zeng To: edk2-devel@lists.01.org Cc: Star Zeng , Michael D Kinney , Jiewen Yao , Yonghong Zhu Date: Fri, 13 Jul 2018 17:08:43 +0800 Message-Id: <1531472923-253528-7-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 In-Reply-To: <1531472923-253528-1-git-send-email-star.zeng@intel.com> References: <1531472923-253528-1-git-send-email-star.zeng@intel.com> Subject: [PATCH 6/6] MdeModulePkg CapsuleApp: Use EFI_UNSUPPORTED for incorrect Argc case X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jul 2018 09:09:02 -0000 Align code to use EFI_UNSUPPORTED for all incorrect Argc cases. Cc: Michael D Kinney Cc: Jiewen Yao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng --- MdeModulePkg/Application/CapsuleApp/CapsuleApp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c index dbcffddea9ce..df5de91ef524 100644 --- a/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c +++ b/MdeModulePkg/Application/CapsuleApp/CapsuleApp.c @@ -193,7 +193,7 @@ CreateBmpFmp ( // VerticalResolution >= BMP_IMAGE_HEADER.PixelHeight if (Argc != 5) { - Print(L"CapsuleApp: Invalid Parameter.\n"); + Print(L"CapsuleApp: Incorrect parameter count.\n"); return EFI_UNSUPPORTED; } @@ -387,7 +387,7 @@ CreateNestedFmp ( EFI_STATUS Status; if (Argc != 5) { - Print(L"CapsuleApp: Invalid Parameter.\n"); + Print(L"CapsuleApp: Incorrect parameter count.\n"); return EFI_UNSUPPORTED; } @@ -793,7 +793,8 @@ PrintUsage ( @param[in] SystemTable The system table. @retval EFI_SUCCESS Command completed successfully. - @retval EFI_INVALID_PARAMETER Command usage error. + @retval EFI_UNSUPPORTED Command usage unsupported. + @retval EFI_INVALID_PARAMETER Command usage invalid. @retval EFI_NOT_FOUND The input file can't be found. **/ EFI_STATUS @@ -824,12 +825,12 @@ UefiMain ( } if (Argc < 2) { PrintUsage(); - return EFI_INVALID_PARAMETER; + return EFI_UNSUPPORTED; } if (StrCmp(Argv[1], L"-D") == 0) { - if (Argc < 3) { - Print(L"CapsuleApp: NO input capsule name.\n"); - return EFI_INVALID_PARAMETER; + if (Argc != 3) { + Print(L"CapsuleApp: Incorrect parameter count.\n"); + return EFI_UNSUPPORTED; } Status = DumpCapsule(Argv[2]); return Status; -- 2.7.0.windows.1