From 47d20b54f9a65b08aa602a1866c1b59a69088dfc Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Sun, 5 Dec 2021 14:54:13 -0800 Subject: 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 Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Michael Kubacki Reviewed-by: Ray Ni --- .../UefiShellLevel1CommandsLib.c | 164 +++++++++++---------- 1 file changed, 88 insertions(+), 76 deletions(-) (limited to 'ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c') diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c index 88cddd88dd..92e438437f 100644 --- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c +++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c @@ -9,15 +9,15 @@ #include "UefiShellLevel1CommandsLib.h" -STATIC CONST CHAR16 mFileName[] = L"ShellCommands"; -EFI_HII_HANDLE gShellLevel1HiiHandle = NULL; +STATIC CONST CHAR16 mFileName[] = L"ShellCommands"; +EFI_HII_HANDLE gShellLevel1HiiHandle = NULL; /** Return the help text filename. Only used if no HII information found. @retval the filename. **/ -CONST CHAR16* +CONST CHAR16 * EFIAPI ShellCommandGetManFileNameLevel1 ( VOID @@ -47,7 +47,7 @@ ShellLevel1CommandsLibConstructor ( // // if shell level is less than 2 do nothing // - if (PcdGet8(PcdShellSupportLevel) < 1) { + if (PcdGet8 (PcdShellSupportLevel) < 1) { return (EFI_SUCCESS); } @@ -59,15 +59,15 @@ ShellLevel1CommandsLibConstructor ( // // install our shell command handlers that are always installed // - ShellCommandRegisterCommandName(L"stall", ShellCommandRunStall , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_STALL) )); - ShellCommandRegisterCommandName(L"for", ShellCommandRunFor , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_FOR) )); - ShellCommandRegisterCommandName(L"goto", ShellCommandRunGoto , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_GOTO) )); - ShellCommandRegisterCommandName(L"if", ShellCommandRunIf , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_IF) )); - ShellCommandRegisterCommandName(L"shift", ShellCommandRunShift , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_SHIFT) )); - ShellCommandRegisterCommandName(L"exit", ShellCommandRunExit , ShellCommandGetManFileNameLevel1, 1, L"", TRUE , gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_EXIT) )); - ShellCommandRegisterCommandName(L"else", ShellCommandRunElse , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_ELSE) )); - ShellCommandRegisterCommandName(L"endif", ShellCommandRunEndIf , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_ENDIF) )); - ShellCommandRegisterCommandName(L"endfor", ShellCommandRunEndFor , ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8(PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN(STR_GET_HELP_ENDFOR))); + ShellCommandRegisterCommandName (L"stall", ShellCommandRunStall, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_STALL))); + ShellCommandRegisterCommandName (L"for", ShellCommandRunFor, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_FOR))); + ShellCommandRegisterCommandName (L"goto", ShellCommandRunGoto, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_GOTO))); + ShellCommandRegisterCommandName (L"if", ShellCommandRunIf, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_IF))); + ShellCommandRegisterCommandName (L"shift", ShellCommandRunShift, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_SHIFT))); + ShellCommandRegisterCommandName (L"exit", ShellCommandRunExit, ShellCommandGetManFileNameLevel1, 1, L"", TRUE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_EXIT))); + ShellCommandRegisterCommandName (L"else", ShellCommandRunElse, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_ELSE))); + ShellCommandRegisterCommandName (L"endif", ShellCommandRunEndIf, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_ENDIF))); + ShellCommandRegisterCommandName (L"endfor", ShellCommandRunEndFor, ShellCommandGetManFileNameLevel1, 1, L"", FALSE, gShellLevel1HiiHandle, (EFI_STRING_ID)(PcdGet8 (PcdShellSupportLevel) < 3 ? 0 : STRING_TOKEN (STR_GET_HELP_ENDFOR))); return (EFI_SUCCESS); } @@ -86,8 +86,9 @@ ShellLevel1CommandsLibDestructor ( ) { if (gShellLevel1HiiHandle != NULL) { - HiiRemovePackages(gShellLevel1HiiHandle); + HiiRemovePackages (gShellLevel1HiiHandle); } + return (EFI_SUCCESS); } @@ -127,18 +128,18 @@ TestNodeForMove ( IN OUT UINTN *TargetCount ) { - BOOLEAN Found; - CHAR16 *CommandName; - CHAR16 *CommandNameWalker; - CHAR16 *TempLocation; + BOOLEAN Found; + CHAR16 *CommandName; + CHAR16 *CommandNameWalker; + CHAR16 *TempLocation; Found = FALSE; // // get just the first part of the command line... // - CommandName = NULL; - CommandName = StrnCatGrow(&CommandName, NULL, CommandNode->Cl, 0); + CommandName = NULL; + CommandName = StrnCatGrow (&CommandName, NULL, CommandNode->Cl, 0); if (CommandName == NULL) { return (FALSE); } @@ -151,7 +152,8 @@ TestNodeForMove ( while ((CommandNameWalker[0] == L' ') || (CommandNameWalker[0] == L'\t')) { CommandNameWalker++; } - TempLocation = StrStr(CommandNameWalker, L" "); + + TempLocation = StrStr (CommandNameWalker, L" "); if (TempLocation != NULL) { *TempLocation = CHAR_NULL; @@ -160,15 +162,19 @@ TestNodeForMove ( // // did we find a nested item ? // - if (gUnicodeCollation->StriColl( - gUnicodeCollation, - (CHAR16*)CommandNameWalker, - (CHAR16*)IncrementerTag) == 0) { + if (gUnicodeCollation->StriColl ( + gUnicodeCollation, + (CHAR16 *)CommandNameWalker, + (CHAR16 *)IncrementerTag + ) == 0) + { (*TargetCount)++; - } else if (gUnicodeCollation->StriColl( - gUnicodeCollation, - (CHAR16*)CommandNameWalker, - (CHAR16*)DecrementerTag) == 0) { + } else if (gUnicodeCollation->StriColl ( + gUnicodeCollation, + (CHAR16 *)CommandNameWalker, + (CHAR16 *)DecrementerTag + ) == 0) + { if (*TargetCount > 0) { (*TargetCount)--; } @@ -189,11 +195,13 @@ TestNodeForMove ( } } } else { - if (gUnicodeCollation->StriColl( - gUnicodeCollation, - (CHAR16*)CommandNameWalker, - (CHAR16*)Label) == 0 - && (*TargetCount) == 0) { + if ( (gUnicodeCollation->StriColl ( + gUnicodeCollation, + (CHAR16 *)CommandNameWalker, + (CHAR16 *)Label + ) == 0) + && ((*TargetCount) == 0)) + { Found = TRUE; if (!FindOnly) { // @@ -211,7 +219,7 @@ TestNodeForMove ( // // Free the memory for this loop... // - FreePool(CommandName); + FreePool (CommandName); return (Found); } @@ -240,24 +248,24 @@ TestNodeForMove ( **/ BOOLEAN MoveToTag ( - IN CONST LIST_MANIP_FUNC Function, - IN CONST CHAR16 *DecrementerTag, - IN CONST CHAR16 *IncrementerTag, - IN CONST CHAR16 *Label OPTIONAL, - IN OUT SCRIPT_FILE *ScriptFile, - IN CONST BOOLEAN MovePast, - IN CONST BOOLEAN FindOnly, - IN CONST BOOLEAN WrapAroundScript + IN CONST LIST_MANIP_FUNC Function, + IN CONST CHAR16 *DecrementerTag, + IN CONST CHAR16 *IncrementerTag, + IN CONST CHAR16 *Label OPTIONAL, + IN OUT SCRIPT_FILE *ScriptFile, + IN CONST BOOLEAN MovePast, + IN CONST BOOLEAN FindOnly, + IN CONST BOOLEAN WrapAroundScript ) { - SCRIPT_COMMAND_LIST *CommandNode; - BOOLEAN Found; - UINTN TargetCount; + SCRIPT_COMMAND_LIST *CommandNode; + BOOLEAN Found; + UINTN TargetCount; if (Label == NULL) { - TargetCount = 1; + TargetCount = 1; } else { - TargetCount = 0; + TargetCount = 0; } if (ScriptFile == NULL) { @@ -265,38 +273,42 @@ MoveToTag ( } for (CommandNode = (SCRIPT_COMMAND_LIST *)(*Function)(&ScriptFile->CommandList, &ScriptFile->CurrentCommand->Link), Found = FALSE - ; !IsNull(&ScriptFile->CommandList, &CommandNode->Link)&& !Found - ; CommandNode = (SCRIPT_COMMAND_LIST *)(*Function)(&ScriptFile->CommandList, &CommandNode->Link) - ){ - Found = TestNodeForMove( - Function, - DecrementerTag, - IncrementerTag, - Label, - ScriptFile, - MovePast, - FindOnly, - CommandNode, - &TargetCount); + ; !IsNull (&ScriptFile->CommandList, &CommandNode->Link) && !Found + ; CommandNode = (SCRIPT_COMMAND_LIST *)(*Function)(&ScriptFile->CommandList, &CommandNode->Link) + ) + { + Found = TestNodeForMove ( + Function, + DecrementerTag, + IncrementerTag, + Label, + ScriptFile, + MovePast, + FindOnly, + CommandNode, + &TargetCount + ); } if (WrapAroundScript && !Found) { - for (CommandNode = (SCRIPT_COMMAND_LIST *)GetFirstNode(&ScriptFile->CommandList), Found = FALSE - ; CommandNode != ScriptFile->CurrentCommand && !Found - ; CommandNode = (SCRIPT_COMMAND_LIST *)(*Function)(&ScriptFile->CommandList, &CommandNode->Link) - ){ - Found = TestNodeForMove( - Function, - DecrementerTag, - IncrementerTag, - Label, - ScriptFile, - MovePast, - FindOnly, - CommandNode, - &TargetCount); + for (CommandNode = (SCRIPT_COMMAND_LIST *)GetFirstNode (&ScriptFile->CommandList), Found = FALSE + ; CommandNode != ScriptFile->CurrentCommand && !Found + ; CommandNode = (SCRIPT_COMMAND_LIST *)(*Function)(&ScriptFile->CommandList, &CommandNode->Link) + ) + { + Found = TestNodeForMove ( + Function, + DecrementerTag, + IncrementerTag, + Label, + ScriptFile, + MovePast, + FindOnly, + CommandNode, + &TargetCount + ); } } + return (Found); } - -- cgit v1.2.3