sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg/Dh: Fix coding style issues

Browse Source 
The change doesn't impact the functionality.

Contributed-under: TianoCore Contribution Agreement 1.0
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Signed-off-by: Chen A Chen <chen.a.chen@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
This commit is contained in:
Chen A Chen
2017-01-05 13:29:50 +08:00
committed by Ruiyu Ni
parent 0976f90821
commit 28f898f856
1 changed files with 54 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
ShellPkg/Library/UefiShellDriver1CommandsLib/Dh.c
View File

@ -642,11 +642,8 @@ DisplayDriverModelHandle (
@param[in] DriverInfo TRUE to show all info about the handle. @param[in] DriverInfo TRUE to show all info about the handle.
@param[in] Multiple TRUE indicates more than will be output, @param[in] Multiple TRUE indicates more than will be output,
FALSE for a single one. 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( DoDhByHandle(
IN CONST EFI_HANDLE TheHandle, IN CONST EFI_HANDLE TheHandle,
IN CONST BOOLEAN Verbose, IN CONST BOOLEAN Verbose,
@ -656,10 +653,8 @@ DoDhByHandle(
IN CONST BOOLEAN Multiple IN CONST BOOLEAN Multiple
) )
{ {
CHAR16 *ProtocolInfoString; CHAR16 *ProtocolInfoString;
SHELL_STATUS ShellStatus;
ShellStatus = SHELL_SUCCESS;
ProtocolInfoString = NULL; ProtocolInfoString = NULL;
if (!Sfo) { if (!Sfo) {
@ -672,7 +667,8 @@ DoDhByHandle(
STRING_TOKEN (STR_DH_OUTPUT), STRING_TOKEN (STR_DH_OUTPUT),
gShellDriver1HiiHandle, gShellDriver1HiiHandle,
ConvertHandleToHandleIndex(TheHandle), ConvertHandleToHandleIndex(TheHandle),
ProtocolInfoString==NULL?L"":ProtocolInfoString); ProtocolInfoString==NULL?L"":ProtocolInfoString
);
} else { } else {
ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", Verbose, TRUE); ProtocolInfoString = GetProtocolInfoString(TheHandle, Language, L"\r\n", Verbose, TRUE);
ShellPrintHiiEx( ShellPrintHiiEx(
@ -683,7 +679,8 @@ DoDhByHandle(
gShellDriver1HiiHandle, gShellDriver1HiiHandle,
ConvertHandleToHandleIndex(TheHandle), ConvertHandleToHandleIndex(TheHandle),
TheHandle, TheHandle,
ProtocolInfoString==NULL?L"":ProtocolInfoString); ProtocolInfoString==NULL?L"":ProtocolInfoString
);
} }
if (DriverInfo) { if (DriverInfo) {
@ -702,16 +699,13 @@ DoDhByHandle(
L"ControllerName", L"ControllerName",
ConvertHandleToHandleIndex(TheHandle), ConvertHandleToHandleIndex(TheHandle),
L"DevPath", L"DevPath",
ProtocolInfoString==NULL?L"":ProtocolInfoString); ProtocolInfoString==NULL?L"":ProtocolInfoString
);
} }
if (ProtocolInfoString != NULL) { if (ProtocolInfoString != NULL) {
FreePool(ProtocolInfoString); FreePool(ProtocolInfoString);
} }
return (ShellStatus);
} }
/** /**
@ -723,8 +717,8 @@ DoDhByHandle(
@param[in] Language Language string per UEFI specification. @param[in] Language Language string per UEFI specification.
@param[in] DriverInfo TRUE to show all info about the handle. @param[in] DriverInfo TRUE to show all info about the handle.
@retval SHELL_SUCCESS The operation was successful. @retval SHELL_SUCCESS The operation was successful.
@retval SHELL_INVALID_PARAMETER ProtocolName was NULL or invalid. @retval SHELL_ABORTED The operation was aborted.
**/ **/
SHELL_STATUS SHELL_STATUS
DoDhForHandleList( DoDhForHandleList(
@ -740,15 +734,8 @@ DoDhForHandleList(
ShellStatus = SHELL_SUCCESS; ShellStatus = SHELL_SUCCESS;
for (HandleWalker = HandleList ; HandleWalker != NULL && *HandleWalker != NULL && ShellStatus == SHELL_SUCCESS; HandleWalker++) { for ( HandleWalker = HandleList; HandleWalker != NULL && *HandleWalker != NULL; HandleWalker++ ) {
ShellStatus = DoDhByHandle( DoDhByHandle (*HandleWalker, Verbose, Sfo, Language, DriverInfo, TRUE);
*HandleWalker,
Verbose,
Sfo,
Language,
DriverInfo,
TRUE
);
if (ShellGetExecutionBreakFlag ()) { if (ShellGetExecutionBreakFlag ()) {
ShellStatus = SHELL_ABORTED; ShellStatus = SHELL_ABORTED;
break; break;
@ -862,10 +849,10 @@ ShellCommandRunDh (
SHELL_STATUS ShellStatus; SHELL_STATUS ShellStatus;
CHAR8 *Language; CHAR8 *Language;
CONST CHAR16 *Lang; CONST CHAR16 *Lang;
CONST CHAR16 *Temp2; CONST CHAR16 *RawValue;
BOOLEAN SfoMode; BOOLEAN SfoFlag;
BOOLEAN FlagD; BOOLEAN DriverFlag;
BOOLEAN Verbose; BOOLEAN VerboseFlag;
UINT64 Intermediate; UINT64 Intermediate;
ShellStatus = SHELL_SUCCESS; ShellStatus = SHELL_SUCCESS;
@ -900,30 +887,32 @@ ShellCommandRunDh (
return (SHELL_INVALID_PARAMETER); return (SHELL_INVALID_PARAMETER);
} }
Lang = ShellCommandLineGetValue(Package, L"-l"); if (ShellCommandLineGetFlag(Package, L"-l")) {
if (Lang != NULL) { Lang = ShellCommandLineGetValue(Package, L"-l");
Language = AllocateZeroPool(StrSize(Lang)); if (Lang != NULL) {
AsciiSPrint(Language, StrSize(Lang), "%S", Lang); Language = AllocateZeroPool(StrSize(Lang));
} else if (!ShellCommandLineGetFlag(Package, L"-l")){ 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); Language = AllocateZeroPool(10);
AsciiSPrint(Language, 10, "en-us"); 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"); SfoFlag = ShellCommandLineGetFlag (Package, L"-sfo");
FlagD = ShellCommandLineGetFlag(Package, L"-d"); DriverFlag = ShellCommandLineGetFlag (Package, L"-d");
Verbose = (BOOLEAN)(ShellCommandLineGetFlag(Package, L"-v") || ShellCommandLineGetFlag(Package, L"-verbose")); VerboseFlag = (BOOLEAN)(ShellCommandLineGetFlag (Package, L"-v") || ShellCommandLineGetFlag (Package, L"-verbose"));
if (ShellCommandLineGetFlag(Package, L"-p")) { if (ShellCommandLineGetFlag (Package, L"-p")) {
if (ShellCommandLineGetCount(Package) > 1) { if (ShellCommandLineGetCount (Package) > 1) {
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh"); ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"dh");
ShellStatus = SHELL_INVALID_PARAMETER; ShellStatus = SHELL_INVALID_PARAMETER;
} else if (ShellCommandLineGetValue(Package, L"-p") == NULL) { } 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; ShellStatus = SHELL_INVALID_PARAMETER;
} else { } else {
// //
@ -931,41 +920,41 @@ ShellCommandRunDh (
// //
ShellStatus = DoDhByProtocol( ShellStatus = DoDhByProtocol(
ShellCommandLineGetValue(Package, L"-p"), ShellCommandLineGetValue(Package, L"-p"),
Verbose, VerboseFlag,
SfoMode, SfoFlag,
Lang==NULL?NULL:Language, Language,
FlagD DriverFlag
); );
} }
} else { } else {
Temp2 = ShellCommandLineGetRawValue(Package, 1); RawValue = ShellCommandLineGetRawValue(Package, 1);
if (Temp2 == NULL) { if (RawValue == NULL) {
// //
// Print everything // Print everything
// //
ShellStatus = DoDhForAll( ShellStatus = DoDhForAll(
SfoMode, SfoFlag,
Verbose, VerboseFlag,
Lang==NULL?NULL:Language, Language,
FlagD DriverFlag
); );
} else { } else {
Status = ShellConvertStringToUint64(Temp2, &Intermediate, TRUE, FALSE); Status = ShellConvertStringToUint64(RawValue, &Intermediate, TRUE, FALSE);
if (EFI_ERROR(Status) || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL) { 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; ShellStatus = SHELL_INVALID_PARAMETER;
} else { } else {
// //
// print 1 handle // print 1 handle
// //
ShellStatus = DoDhByHandle( DoDhByHandle(
ConvertHandleIndexToHandle((UINTN)Intermediate), ConvertHandleIndexToHandle((UINTN)Intermediate),
Verbose, VerboseFlag,
SfoMode, SfoFlag,
Lang==NULL?NULL:Language, Language,
FlagD, DriverFlag,
FALSE FALSE
); );
} }
} }
} }