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:
Michael Kubacki
committed by
mergify[bot]
mergify[bot]
parent
c411b485b6
commit
47d20b54f9
@ -48,70 +48,75 @@ GetDeviceHandleInfo (
|
||||
IN CONST CHAR8 *Language
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
EFI_HANDLE *HandleBuffer;
|
||||
UINTN Count;
|
||||
EFI_STATUS Status;
|
||||
EFI_HANDLE *HandleBuffer;
|
||||
UINTN Count;
|
||||
|
||||
if (TheHandle == NULL
|
||||
|| Type == NULL
|
||||
|| Cfg == NULL
|
||||
|| Diag == NULL
|
||||
|| Parents == NULL
|
||||
|| Devices == NULL
|
||||
|| Children == NULL
|
||||
|| Name == NULL ) {
|
||||
if ( (TheHandle == NULL)
|
||||
|| (Type == NULL)
|
||||
|| (Cfg == NULL)
|
||||
|| (Diag == NULL)
|
||||
|| (Parents == NULL)
|
||||
|| (Devices == NULL)
|
||||
|| (Children == NULL)
|
||||
|| (Name == NULL))
|
||||
{
|
||||
return (EFI_INVALID_PARAMETER);
|
||||
}
|
||||
|
||||
*Cfg = FALSE;
|
||||
*Diag = FALSE;
|
||||
*Children = 0;
|
||||
*Parents = 0;
|
||||
*Devices = 0;
|
||||
*Type = L' ';
|
||||
*Name = CHAR_NULL;
|
||||
HandleBuffer = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
*Cfg = FALSE;
|
||||
*Diag = FALSE;
|
||||
*Children = 0;
|
||||
*Parents = 0;
|
||||
*Devices = 0;
|
||||
*Type = L' ';
|
||||
*Name = CHAR_NULL;
|
||||
HandleBuffer = NULL;
|
||||
Status = EFI_SUCCESS;
|
||||
|
||||
gEfiShellProtocol->GetDeviceName(TheHandle, EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8*)Language, Name);
|
||||
gEfiShellProtocol->GetDeviceName (TheHandle, EFI_DEVICE_NAME_USE_COMPONENT_NAME|EFI_DEVICE_NAME_USE_DEVICE_PATH, (CHAR8 *)Language, Name);
|
||||
|
||||
Status = ParseHandleDatabaseForChildControllers(TheHandle, Children, NULL);
|
||||
// if (!EFI_ERROR(Status)) {
|
||||
Status = PARSE_HANDLE_DATABASE_PARENTS(TheHandle, Parents, NULL);
|
||||
if (/*!EFI_ERROR(Status) && */Parents != NULL && Children != NULL) {
|
||||
if (*Parents == 0) {
|
||||
*Type = L'R';
|
||||
} else if (*Children > 0) {
|
||||
*Type = L'B';
|
||||
} else {
|
||||
*Type = L'D';
|
||||
}
|
||||
Status = ParseHandleDatabaseForChildControllers (TheHandle, Children, NULL);
|
||||
// if (!EFI_ERROR(Status)) {
|
||||
Status = PARSE_HANDLE_DATABASE_PARENTS (TheHandle, Parents, NULL);
|
||||
if (/*!EFI_ERROR(Status) && */ (Parents != NULL) && (Children != NULL)) {
|
||||
if (*Parents == 0) {
|
||||
*Type = L'R';
|
||||
} else if (*Children > 0) {
|
||||
*Type = L'B';
|
||||
} else {
|
||||
*Type = L'D';
|
||||
}
|
||||
// }
|
||||
Status = PARSE_HANDLE_DATABASE_UEFI_DRIVERS(TheHandle, Devices, &HandleBuffer);
|
||||
if (!EFI_ERROR(Status) && Devices != NULL && HandleBuffer != NULL) {
|
||||
for (Count = 0 ; Count < *Devices ; Count++) {
|
||||
if (!EFI_ERROR(gBS->OpenProtocol(HandleBuffer[Count], &gEfiDriverConfigurationProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
}
|
||||
|
||||
// }
|
||||
Status = PARSE_HANDLE_DATABASE_UEFI_DRIVERS (TheHandle, Devices, &HandleBuffer);
|
||||
if (!EFI_ERROR (Status) && (Devices != NULL) && (HandleBuffer != NULL)) {
|
||||
for (Count = 0; Count < *Devices; Count++) {
|
||||
if (!EFI_ERROR (gBS->OpenProtocol (HandleBuffer[Count], &gEfiDriverConfigurationProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
*Cfg = TRUE;
|
||||
}
|
||||
if (!EFI_ERROR(gBS->OpenProtocol(HandleBuffer[Count], &gEfiDriverDiagnosticsProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
|
||||
if (!EFI_ERROR (gBS->OpenProtocol (HandleBuffer[Count], &gEfiDriverDiagnosticsProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
*Diag = TRUE;
|
||||
}
|
||||
if (!EFI_ERROR(gBS->OpenProtocol(HandleBuffer[Count], &gEfiDriverDiagnostics2ProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
|
||||
if (!EFI_ERROR (gBS->OpenProtocol (HandleBuffer[Count], &gEfiDriverDiagnostics2ProtocolGuid, NULL, NULL, gImageHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL))) {
|
||||
*Diag = TRUE;
|
||||
}
|
||||
}
|
||||
SHELL_FREE_NON_NULL(HandleBuffer);
|
||||
|
||||
SHELL_FREE_NON_NULL (HandleBuffer);
|
||||
}
|
||||
|
||||
return (Status);
|
||||
}
|
||||
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{L"-sfo", TypeFlag},
|
||||
{L"-l", TypeValue},
|
||||
{NULL, TypeMax}
|
||||
};
|
||||
STATIC CONST SHELL_PARAM_ITEM ParamList[] = {
|
||||
{ L"-sfo", TypeFlag },
|
||||
{ L"-l", TypeValue },
|
||||
{ NULL, TypeMax }
|
||||
};
|
||||
|
||||
/**
|
||||
Function for 'devices' command.
|
||||
@ -126,78 +131,77 @@ ShellCommandRunDevices (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
EFI_HANDLE *HandleList;
|
||||
EFI_HANDLE *HandleListWalker;
|
||||
CHAR16 Type;
|
||||
BOOLEAN Cfg;
|
||||
BOOLEAN Diag;
|
||||
UINTN Parents;
|
||||
UINTN Devices;
|
||||
UINTN Children;
|
||||
CHAR16 *Name;
|
||||
CONST CHAR16 *Lang;
|
||||
BOOLEAN SfoFlag;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
CHAR8 *Language;
|
||||
EFI_HANDLE *HandleList;
|
||||
EFI_HANDLE *HandleListWalker;
|
||||
CHAR16 Type;
|
||||
BOOLEAN Cfg;
|
||||
BOOLEAN Diag;
|
||||
UINTN Parents;
|
||||
UINTN Devices;
|
||||
UINTN Children;
|
||||
CHAR16 *Name;
|
||||
CONST CHAR16 *Lang;
|
||||
BOOLEAN SfoFlag;
|
||||
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Language = NULL;
|
||||
SfoFlag = FALSE;
|
||||
ShellStatus = SHELL_SUCCESS;
|
||||
Language = NULL;
|
||||
SfoFlag = FALSE;
|
||||
|
||||
//
|
||||
// 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 (ParamList, &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"devices", 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"devices", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
//
|
||||
// if more than 0 'value' parameters we have too many parameters
|
||||
//
|
||||
if (ShellCommandLineGetRawValue(Package, 1) != NULL){
|
||||
if (ShellCommandLineGetRawValue (Package, 1) != NULL) {
|
||||
//
|
||||
// error for too many parameters
|
||||
//
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devices");
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDriver1HiiHandle, L"devices");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
//
|
||||
// get the language if necessary
|
||||
//
|
||||
Lang = ShellCommandLineGetValue(Package, L"-l");
|
||||
Lang = ShellCommandLineGetValue (Package, L"-l");
|
||||
if (Lang != NULL) {
|
||||
Language = AllocateZeroPool(StrSize(Lang));
|
||||
AsciiSPrint(Language, StrSize(Lang), "%S", Lang);
|
||||
} else if (!ShellCommandLineGetFlag(Package, L"-l")){
|
||||
ASSERT(Language == NULL);
|
||||
// Language = AllocateZeroPool(10);
|
||||
// AsciiSPrint(Language, 10, "en-us");
|
||||
Language = AllocateZeroPool (StrSize (Lang));
|
||||
AsciiSPrint (Language, StrSize (Lang), "%S", Lang);
|
||||
} else if (!ShellCommandLineGetFlag (Package, L"-l")) {
|
||||
ASSERT (Language == NULL);
|
||||
// Language = AllocateZeroPool(10);
|
||||
// AsciiSPrint(Language, 10, "en-us");
|
||||
} else {
|
||||
ASSERT(Language == NULL);
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devices", L"-l");
|
||||
ASSERT (Language == NULL);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_NO_VALUE), gShellDriver1HiiHandle, L"devices", L"-l");
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
return (SHELL_INVALID_PARAMETER);
|
||||
}
|
||||
|
||||
|
||||
//
|
||||
// Print Header
|
||||
|
||||
@ -212,52 +216,54 @@ ShellCommandRunDevices (
|
||||
//
|
||||
// loop through each handle
|
||||
//
|
||||
HandleList = GetHandleListByProtocol(NULL);
|
||||
ASSERT(HandleList != NULL);
|
||||
HandleList = GetHandleListByProtocol (NULL);
|
||||
ASSERT (HandleList != NULL);
|
||||
for (HandleListWalker = HandleList
|
||||
; HandleListWalker != NULL && *HandleListWalker != NULL /*&& !EFI_ERROR(Status)*/
|
||||
; HandleListWalker++
|
||||
){
|
||||
|
||||
; HandleListWalker != NULL && *HandleListWalker != NULL /*&& !EFI_ERROR(Status)*/
|
||||
; HandleListWalker++
|
||||
)
|
||||
{
|
||||
//
|
||||
// get all the info on each handle
|
||||
//
|
||||
Name = NULL;
|
||||
Status = GetDeviceHandleInfo(*HandleListWalker, &Type, &Cfg, &Diag, &Parents, &Devices, &Children, &Name, Language);
|
||||
if (Name != NULL && (Parents != 0 || Devices != 0 || Children != 0)) {
|
||||
Name = NULL;
|
||||
Status = GetDeviceHandleInfo (*HandleListWalker, &Type, &Cfg, &Diag, &Parents, &Devices, &Children, &Name, Language);
|
||||
if ((Name != NULL) && ((Parents != 0) || (Devices != 0) || (Children != 0))) {
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
Language,
|
||||
SfoFlag?STRING_TOKEN (STR_DEVICES_ITEM_LINE_SFO):STRING_TOKEN (STR_DEVICES_ITEM_LINE),
|
||||
SfoFlag ? STRING_TOKEN (STR_DEVICES_ITEM_LINE_SFO) : STRING_TOKEN (STR_DEVICES_ITEM_LINE),
|
||||
gShellDriver1HiiHandle,
|
||||
ConvertHandleToHandleIndex (*HandleListWalker),
|
||||
Type,
|
||||
Cfg?(SfoFlag?L'Y':L'X'):(SfoFlag?L'N':L'-'),
|
||||
Diag?(SfoFlag?L'Y':L'X'):(SfoFlag?L'N':L'-'),
|
||||
Cfg ? (SfoFlag ? L'Y' : L'X') : (SfoFlag ? L'N' : L'-'),
|
||||
Diag ? (SfoFlag ? L'Y' : L'X') : (SfoFlag ? L'N' : L'-'),
|
||||
Parents,
|
||||
Devices,
|
||||
Children,
|
||||
Name!=NULL?Name:L"<UNKNOWN>");
|
||||
Name != NULL ? Name : L"<UNKNOWN>"
|
||||
);
|
||||
}
|
||||
|
||||
if (Name != NULL) {
|
||||
FreePool(Name);
|
||||
FreePool (Name);
|
||||
}
|
||||
|
||||
if (ShellGetExecutionBreakFlag ()) {
|
||||
ShellStatus = SHELL_ABORTED;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (HandleList != NULL) {
|
||||
FreePool(HandleList);
|
||||
FreePool (HandleList);
|
||||
}
|
||||
|
||||
}
|
||||
SHELL_FREE_NON_NULL(Language);
|
||||
|
||||
SHELL_FREE_NON_NULL (Language);
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
}
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user