ShellPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the ShellPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
committed by
mergify[bot]
parent
c411b485b6
commit
47d20b54f9
@ -9,14 +9,14 @@
|
||||
|
||||
#include "UefiShellDriver1CommandsLib.h"
|
||||
|
||||
STATIC CONST CHAR16 StringHandProt[] = L"HandProt ";
|
||||
STATIC CONST CHAR16 StringGetProt[] = L"GetProt ";
|
||||
STATIC CONST CHAR16 StringTestProt[] = L"TestProt ";
|
||||
STATIC CONST CHAR16 StringChild[] = L"Child ";
|
||||
STATIC CONST CHAR16 StringDriver[] = L"Driver ";
|
||||
STATIC CONST CHAR16 StringExclusive[] = L"Exclusive";
|
||||
STATIC CONST CHAR16 StringDriverEx[] = L"DriverEx ";
|
||||
STATIC CONST CHAR16 StringUnknown[] = L"Unknown ";
|
||||
STATIC CONST CHAR16 StringHandProt[] = L"HandProt ";
|
||||
STATIC CONST CHAR16 StringGetProt[] = L"GetProt ";
|
||||
STATIC CONST CHAR16 StringTestProt[] = L"TestProt ";
|
||||
STATIC CONST CHAR16 StringChild[] = L"Child ";
|
||||
STATIC CONST CHAR16 StringDriver[] = L"Driver ";
|
||||
STATIC CONST CHAR16 StringExclusive[] = L"Exclusive";
|
||||
STATIC CONST CHAR16 StringDriverEx[] = L"DriverEx ";
|
||||
STATIC CONST CHAR16 StringUnknown[] = L"Unknown ";
|
||||
|
||||
/**
|
||||
Open the database and print out all the info about TheHandle.
|
||||
@ -28,21 +28,21 @@ STATIC CONST CHAR16 StringUnknown[] = L"Unknown ";
|
||||
**/
|
||||
EFI_STATUS
|
||||
TraverseHandleDatabase (
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
IN CONST EFI_HANDLE TheHandle
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_GUID **ProtocolGuidArray;
|
||||
UINTN ArrayCount;
|
||||
UINTN ProtocolIndex;
|
||||
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfo;
|
||||
UINTN OpenInfoCount;
|
||||
UINTN OpenInfoIndex;
|
||||
CONST CHAR16 *OpenTypeString;
|
||||
CHAR16 *TempString;
|
||||
UINTN HandleIndex;
|
||||
CONST CHAR16 *Name;
|
||||
UINTN ControllerIndex;
|
||||
EFI_STATUS Status;
|
||||
EFI_GUID **ProtocolGuidArray;
|
||||
UINTN ArrayCount;
|
||||
UINTN ProtocolIndex;
|
||||
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfo;
|
||||
UINTN OpenInfoCount;
|
||||
UINTN OpenInfoIndex;
|
||||
CONST CHAR16 *OpenTypeString;
|
||||
CHAR16 *TempString;
|
||||
UINTN HandleIndex;
|
||||
CONST CHAR16 *Name;
|
||||
UINTN ControllerIndex;
|
||||
|
||||
if (TheHandle == NULL) {
|
||||
return (EFI_INVALID_PARAMETER);
|
||||
@ -52,80 +52,91 @@ TraverseHandleDatabase (
|
||||
// Retrieve the list of all the protocols on the handle
|
||||
//
|
||||
Status = gBS->ProtocolsPerHandle (
|
||||
TheHandle,
|
||||
&ProtocolGuidArray,
|
||||
&ArrayCount
|
||||
);
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
TheHandle,
|
||||
&ProtocolGuidArray,
|
||||
&ArrayCount
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
|
||||
for (ProtocolIndex = 0; ProtocolIndex < ArrayCount; ProtocolIndex++) {
|
||||
//
|
||||
// print out the human readable name for this one.
|
||||
//
|
||||
TempString = GetStringNameFromGuid(ProtocolGuidArray[ProtocolIndex], NULL);
|
||||
TempString = GetStringNameFromGuid (ProtocolGuidArray[ProtocolIndex], NULL);
|
||||
if (TempString == NULL) {
|
||||
continue;
|
||||
}
|
||||
ShellPrintEx(-1, -1, L"%H%s%N\r\n", TempString);
|
||||
FreePool(TempString);
|
||||
|
||||
ShellPrintEx (-1, -1, L"%H%s%N\r\n", TempString);
|
||||
FreePool (TempString);
|
||||
|
||||
//
|
||||
// Retrieve the list of agents that have opened each protocol
|
||||
//
|
||||
Status = gBS->OpenProtocolInformation (
|
||||
TheHandle,
|
||||
ProtocolGuidArray[ProtocolIndex],
|
||||
&OpenInfo,
|
||||
&OpenInfoCount
|
||||
);
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
TheHandle,
|
||||
ProtocolGuidArray[ProtocolIndex],
|
||||
&OpenInfo,
|
||||
&OpenInfoCount
|
||||
);
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
if (!EFI_ERROR (Status)) {
|
||||
for (OpenInfoIndex = 0; OpenInfoIndex < OpenInfoCount; OpenInfoIndex++) {
|
||||
switch (OpenInfo[OpenInfoIndex].Attributes) {
|
||||
case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: OpenTypeString = StringHandProt; break;
|
||||
case EFI_OPEN_PROTOCOL_GET_PROTOCOL: OpenTypeString = StringGetProt; break;
|
||||
case EFI_OPEN_PROTOCOL_TEST_PROTOCOL: OpenTypeString = StringTestProt; break;
|
||||
case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER: OpenTypeString = StringChild; break;
|
||||
case EFI_OPEN_PROTOCOL_BY_DRIVER: OpenTypeString = StringDriver; break;
|
||||
case EFI_OPEN_PROTOCOL_EXCLUSIVE: OpenTypeString = StringExclusive; break;
|
||||
case EFI_OPEN_PROTOCOL_BY_HANDLE_PROTOCOL: OpenTypeString = StringHandProt;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_GET_PROTOCOL: OpenTypeString = StringGetProt;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_TEST_PROTOCOL: OpenTypeString = StringTestProt;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER: OpenTypeString = StringChild;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_BY_DRIVER: OpenTypeString = StringDriver;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_EXCLUSIVE: OpenTypeString = StringExclusive;
|
||||
break;
|
||||
case EFI_OPEN_PROTOCOL_BY_DRIVER|EFI_OPEN_PROTOCOL_EXCLUSIVE:
|
||||
OpenTypeString = StringDriverEx; break;
|
||||
default: OpenTypeString = StringUnknown; break;
|
||||
OpenTypeString = StringDriverEx;
|
||||
break;
|
||||
default: OpenTypeString = StringUnknown;
|
||||
break;
|
||||
}
|
||||
HandleIndex = ConvertHandleToHandleIndex(OpenInfo[OpenInfoIndex].AgentHandle);
|
||||
Name = GetStringNameFromHandle(OpenInfo[OpenInfoIndex].AgentHandle, NULL);
|
||||
ControllerIndex = ConvertHandleToHandleIndex(OpenInfo[OpenInfoIndex].ControllerHandle);
|
||||
|
||||
HandleIndex = ConvertHandleToHandleIndex (OpenInfo[OpenInfoIndex].AgentHandle);
|
||||
Name = GetStringNameFromHandle (OpenInfo[OpenInfoIndex].AgentHandle, NULL);
|
||||
ControllerIndex = ConvertHandleToHandleIndex (OpenInfo[OpenInfoIndex].ControllerHandle);
|
||||
if (ControllerIndex != 0) {
|
||||
ShellPrintHiiEx(
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN(STR_OPENINFO_LINE),
|
||||
STRING_TOKEN (STR_OPENINFO_LINE),
|
||||
gShellDriver1HiiHandle,
|
||||
HandleIndex,
|
||||
ControllerIndex,
|
||||
OpenInfo[OpenInfoIndex].OpenCount,
|
||||
OpenTypeString,
|
||||
Name
|
||||
);
|
||||
);
|
||||
} else {
|
||||
ShellPrintHiiEx(
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN(STR_OPENINFO_MIN_LINE),
|
||||
STRING_TOKEN (STR_OPENINFO_MIN_LINE),
|
||||
gShellDriver1HiiHandle,
|
||||
HandleIndex,
|
||||
OpenInfo[OpenInfoIndex].OpenCount,
|
||||
OpenTypeString,
|
||||
Name
|
||||
);
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
FreePool (OpenInfo);
|
||||
}
|
||||
}
|
||||
|
||||
FreePool (ProtocolGuidArray);
|
||||
}
|
||||
|
||||
@ -145,66 +156,67 @@ ShellCommandRunOpenInfo (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_HANDLE TheHandle;
|
||||
CONST CHAR16 *Param1;
|
||||
UINT64 Intermediate;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
EFI_HANDLE TheHandle;
|
||||
CONST CHAR16 *Param1;
|
||||
UINT64 Intermediate;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (EmptyParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"openinfo", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDriver1HiiHandle, L"openinfo", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
if (ShellCommandLineGetCount(Package) > 2){
|
||||
if (ShellCommandLineGetCount (Package) > 2) {
|
||||
//
|
||||
// error for too many parameters
|
||||
//
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"openinfo");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"openinfo");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else if (ShellCommandLineGetCount(Package) == 0) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"openinfo");
|
||||
} else if (ShellCommandLineGetCount (Package) == 0) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDriver1HiiHandle, L"openinfo");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
Param1 = ShellCommandLineGetRawValue(Package, 1);
|
||||
Status = ShellConvertStringToUint64(Param1, &Intermediate, TRUE, FALSE);
|
||||
if (EFI_ERROR(Status) || Param1 == NULL || ConvertHandleIndexToHandle((UINTN)Intermediate) == NULL){
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
Param1 = ShellCommandLineGetRawValue (Package, 1);
|
||||
Status = ShellConvertStringToUint64 (Param1, &Intermediate, TRUE, FALSE);
|
||||
if (EFI_ERROR (Status) || (Param1 == NULL) || (ConvertHandleIndexToHandle ((UINTN)Intermediate) == NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
TheHandle = ConvertHandleIndexToHandle((UINTN)Intermediate);
|
||||
ASSERT(TheHandle != NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_OPENINFO_HEADER_LINE), gShellDriver1HiiHandle, (UINTN)Intermediate, TheHandle);
|
||||
TheHandle = ConvertHandleIndexToHandle ((UINTN)Intermediate);
|
||||
ASSERT (TheHandle != NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_OPENINFO_HEADER_LINE), gShellDriver1HiiHandle, (UINTN)Intermediate, TheHandle);
|
||||
|
||||
Status = TraverseHandleDatabase (TheHandle);
|
||||
if (!EFI_ERROR(Status)) {
|
||||
if (!EFI_ERROR (Status)) {
|
||||
} else {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_INV_HANDLE), gShellDriver1HiiHandle, L"openinfo", Param1);
|
||||
ShellStatus = SHELL_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
Reference in New Issue
Block a user