From 10944bc390f52fcd418670fe0171da1d4f3b05cc Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Fri, 13 Jul 2018 16:00:15 +0800 Subject: [PATCH] MdeModulePkg CapsuleApp: Use EFI_UNSUPPORTED for incorrect Argc case 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 Reviewed-by: Jiewen Yao --- 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 dbcffddea9..df5de91ef5 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;