From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 3338381951 for ; Mon, 9 Jan 2017 01:31:11 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP; 09 Jan 2017 01:30:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,339,1477983600"; d="scan'208";a="211175762" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.25]) by fmsmga004.fm.intel.com with ESMTP; 09 Jan 2017 01:30:58 -0800 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Chen A Chen , Jaben Carsey Date: Mon, 9 Jan 2017 17:30:51 +0800 Message-Id: <20170109093052.140504-5-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.9.0.windows.1 In-Reply-To: <20170109093052.140504-1-ruiyu.ni@intel.com> References: <20170109093052.140504-1-ruiyu.ni@intel.com> Subject: [PATCH 4/5] ShellPkg/Dh: Fix coding style issues X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2017 09:31:11 -0000 From: Chen A Chen The change doesn't impact the functionality. Contributed-under: TianoCore Contribution Agreement 1.0 Cc: Jaben Carsey Cc: Ruiyu Ni Signed-off-by: Ruiyu Ni Signed-off-by: Chen A Chen --- ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c | 119 ++++++++++------------ 1 file changed, 54 insertions(+), 65 deletions(-) diff --git a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c index 0ac49e1..2773842 100644 --- a/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c +++ b/ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c @@ -642,11 +642,8 @@ DisplayDriverModelHandle ( @param[in] DriverInfo TRUE to show all info about the handle. @param[in] Multiple TRUE indicates more than will be output, FALSE for a single one. - - @retval SHELL_SUCCESS The operation was successful. - @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid. **/ -SHELL_STATUS +VOID DoDhByHandle( IN CONST EFI_HANDLE TheHandle, IN CONST BOOLEAN Verbose, @@ -656,10 +653,8 @@ DoDhByHandle( IN CONST BOOLEAN Multiple ) { - CHAR16 *ProtocolInfoString; - SHELL_STATUS ShellStatus; + CHAR16 *ProtocolInfoString; - ShellStatus = SHELL_SUCCESS; ProtocolInfoString = NULL; if (!Sfo) { @@ -672,7 +667,8 @@ DoDhByHandle( STRING_TOKEN (STR_DH_OUTPUT), gShellDriver1HiiHandle, ConvertHandleToHandleIndex(TheHandle), - ProtocolInfoString==NULL?L"":ProtocolInfoString); + ProtocolInfoString==NULL?L"":ProtocolInfoString + ); } else { ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", Verbose, TRUE); ShellPrintHiiEx( @@ -683,7 +679,8 @@ DoDhByHandle( gShellDriver1HiiHandle, ConvertHandleToHandleIndex(TheHandle), TheHandle, - ProtocolInfoString==NULL?L"":ProtocolInfoString); + ProtocolInfoString==NULL?L"":ProtocolInfoString + ); } if (DriverInfo) { @@ -702,16 +699,13 @@ DoDhByHandle( L"ControllerName", ConvertHandleToHandleIndex(TheHandle), L"DevPath", - ProtocolInfoString==NULL?L"":ProtocolInfoString); - - + ProtocolInfoString==NULL?L"":ProtocolInfoString + ); } - if (ProtocolInfoString != NULL) { FreePool(ProtocolInfoString); } - return (ShellStatus); } /** @@ -723,8 +717,8 @@ DoDhByHandle( @param[in] Language Language string per UEFI specification. @param[in] DriverInfo TRUE to show all info about the handle. - @retval SHELL_SUCCESS The operation was successful. - @retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid. + @retval SHELL_SUCCESS The operation was successful. + @retval SHELL_ABORTED The operation was aborted. **/ SHELL_STATUS DoDhForHandleList( @@ -740,15 +734,8 @@ DoDhForHandleList( ShellStatus = SHELL_SUCCESS; - for (HandleWalker = HandleList ; HandleWalker != NULL && *HandleWalker != NULL && ShellStatus == SHELL_SUCCESS; HandleWalker++) { - ShellStatus = DoDhByHandle( - *HandleWalker, - Verbose, - Sfo, - Language, - DriverInfo, - TRUE - ); + for ( HandleWalker = HandleList; HandleWalker != NULL && *HandleWalker != NULL; HandleWalker++ ) { + DoDhByHandle (*HandleWalker, Verbose, Sfo, Language, DriverInfo, TRUE); if (ShellGetExecutionBreakFlag ()) { ShellStatus = SHELL_ABORTED; break; @@ -862,10 +849,10 @@ ShellCommandRunDh ( SHELL_STATUS ShellStatus; CHAR8 *Language; CONST CHAR16 *Lang; - CONST CHAR16 *Temp2; - BOOLEAN SfoMode; - BOOLEAN FlagD; - BOOLEAN Verbose; + CONST CHAR16 *RawValue; + BOOLEAN SfoFlag; + BOOLEAN DriverFlag; + BOOLEAN VerboseFlag; UINT64 Intermediate; ShellStatus = SHELL_SUCCESS; @@ -900,30 +887,32 @@ ShellCommandRunDh ( return (SHELL_INVALID_PARAMETER); } - Lang = ShellCommandLineGetValue(Package, L"-l"); - if (Lang != NULL) { - Language = AllocateZeroPool(StrSize(Lang)); - AsciiSPrint(Language, StrSize(Lang), "%S", Lang); - } else if (!ShellCommandLineGetFlag(Package, L"-l")){ + if (ShellCommandLineGetFlag(Package, L"-l")) { + Lang = ShellCommandLineGetValue(Package, L"-l"); + if (Lang != NULL) { + Language = AllocateZeroPool(StrSize(Lang)); + AsciiSPrint(Language, StrSize(Lang), "%S", Lang); + } else { + ASSERT(Language == NULL); + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN(STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh", L"-l"); + ShellCommandLineFreeVarList(Package); + return (SHELL_INVALID_PARAMETER); + } + } else { Language = AllocateZeroPool(10); AsciiSPrint(Language, 10, "en-us"); - } else { - ASSERT(Language == NULL); - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh", L"-l"); - ShellCommandLineFreeVarList (Package); - return (SHELL_INVALID_PARAMETER); } - SfoMode = ShellCommandLineGetFlag(Package, L"-sfo"); - FlagD = ShellCommandLineGetFlag(Package, L"-d"); - Verbose = (BOOLEAN)(ShellCommandLineGetFlag(Package, L"-v") || ShellCommandLineGetFlag(Package, L"-verbose")); + SfoFlag = ShellCommandLineGetFlag (Package, L"-sfo"); + DriverFlag = ShellCommandLineGetFlag (Package, L"-d"); + VerboseFlag = (BOOLEAN)(ShellCommandLineGetFlag (Package, L"-v") || ShellCommandLineGetFlag (Package, L"-verbose")); - if (ShellCommandLineGetFlag(Package, L"-p")) { - if (ShellCommandLineGetCount(Package) > 1) { - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh"); + if (ShellCommandLineGetFlag (Package, L"-p")) { + if (ShellCommandLineGetCount (Package) > 1) { + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh"); ShellStatus = SHELL_INVALID_PARAMETER; } else if (ShellCommandLineGetValue(Package, L"-p") == NULL) { - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh", L"-p"); + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"dh", L"-p"); ShellStatus = SHELL_INVALID_PARAMETER; } else { // @@ -931,41 +920,41 @@ ShellCommandRunDh ( // ShellStatus = DoDhByProtocol( ShellCommandLineGetValue(Package, L"-p"), - Verbose, - SfoMode, - Lang==NULL?NULL:Language, - FlagD - ); + VerboseFlag, + SfoFlag, + Language, + DriverFlag + ); } } else { - Temp2 = ShellCommandLineGetRawValue(Package, 1); - if (Temp2 == NULL) { + RawValue = ShellCommandLineGetRawValue(Package, 1); + if (RawValue == NULL) { // // Print everything // ShellStatus = DoDhForAll( - SfoMode, - Verbose, - Lang==NULL?NULL:Language, - FlagD + SfoFlag, + VerboseFlag, + Language, + DriverFlag ); } else { - Status = ShellConvertStringToUint64(Temp2, &Intermediate, TRUE, FALSE); + Status = ShellConvertStringToUint64(RawValue, &Intermediate, TRUE, FALSE); if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) { - ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"dh", Temp2); + ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"dh", RawValue); ShellStatus = SHELL_INVALID_PARAMETER; } else { // // print 1 handle // - ShellStatus = DoDhByHandle( + DoDhByHandle( ConvertHandleIndexToHandle((UINTN)Intermediate), - Verbose, - SfoMode, - Lang==NULL?NULL:Language, - FlagD, + VerboseFlag, + SfoFlag, + Language, + DriverFlag, FALSE - ); + ); } } } -- 2.9.0.windows.1