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>

1 files changed, 78 insertions, 70 deletions

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiCompress.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiCompress.c
index 261129e88c..d581a334f4 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiCompress.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiCompress.c
@@ -23,103 +23,107 @@ ShellCommandRunEfiCompress (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS          Status;

-  LIST_ENTRY          *Package;

-  CHAR16              *ProblemParam;

-  SHELL_STATUS        ShellStatus;

-  SHELL_FILE_HANDLE   InShellFileHandle;

-  SHELL_FILE_HANDLE   OutShellFileHandle;

-  UINT64              OutSize;

-  UINTN               OutSize2;

-  VOID                *OutBuffer;

-  UINT64              InSize;

-  UINTN               InSize2;

-  VOID                *InBuffer;

-  CHAR16              *InFileName;

-  CONST CHAR16        *OutFileName;

-  CONST CHAR16        *TempParam;

-

-  InFileName          = NULL;

-  OutFileName         = NULL;

-  OutSize             = 0;

-  ShellStatus         = SHELL_SUCCESS;

-  Status              = EFI_SUCCESS;

-  OutBuffer           = NULL;

-  InShellFileHandle   = NULL;

-  OutShellFileHandle  = NULL;

-  InBuffer            = NULL;

+  EFI_STATUS         Status;

+  LIST_ENTRY         *Package;

+  CHAR16             *ProblemParam;

+  SHELL_STATUS       ShellStatus;

+  SHELL_FILE_HANDLE  InShellFileHandle;

+  SHELL_FILE_HANDLE  OutShellFileHandle;

+  UINT64             OutSize;

+  UINTN              OutSize2;

+  VOID               *OutBuffer;

+  UINT64             InSize;

+  UINTN              InSize2;

+  VOID               *InBuffer;

+  CHAR16             *InFileName;

+  CONST CHAR16       *OutFileName;

+  CONST CHAR16       *TempParam;

+

+  InFileName         = NULL;

+  OutFileName        = NULL;

+  OutSize            = 0;

+  ShellStatus        = SHELL_SUCCESS;

+  Status             = EFI_SUCCESS;

+  OutBuffer          = NULL;

+  InShellFileHandle  = NULL;

+  OutShellFileHandle = NULL;

+  InBuffer           = NULL;

 

   //

   // 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), gShellDebug1HiiHandle, L"eficompress", ProblemParam);

-      FreePool(ProblemParam);

+  if (EFI_ERROR (Status)) {

+    if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {

+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"eficompress", ProblemParam);

+      FreePool (ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

-      ASSERT(FALSE);

+      ASSERT (FALSE);

     }

   } else {

-    if (ShellCommandLineGetCount(Package) > 3) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"eficompress");

+    if (ShellCommandLineGetCount (Package) > 3) {

+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"eficompress");

       ShellStatus = SHELL_INVALID_PARAMETER;

-    } else if (ShellCommandLineGetCount(Package) < 3) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"eficompress");

+    } else if (ShellCommandLineGetCount (Package) < 3) {

+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellDebug1HiiHandle, L"eficompress");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

-      TempParam = ShellCommandLineGetRawValue(Package, 1);

-      ASSERT(TempParam != NULL);

-      InFileName = ShellFindFilePath(TempParam);

-      OutFileName = ShellCommandLineGetRawValue(Package, 2);

+      TempParam = ShellCommandLineGetRawValue (Package, 1);

+      ASSERT (TempParam != NULL);

+      InFileName  = ShellFindFilePath (TempParam);

+      OutFileName = ShellCommandLineGetRawValue (Package, 2);

       if (InFileName == NULL) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, L"eficompress", TempParam);

+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_FILE_FIND_FAIL), gShellDebug1HiiHandle, L"eficompress", TempParam);

         ShellStatus = SHELL_NOT_FOUND;

       } else {

-        if (ShellIsDirectory(InFileName) == EFI_SUCCESS){

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, L"eficompress", InFileName);

+        if (ShellIsDirectory (InFileName) == EFI_SUCCESS) {

+          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, L"eficompress", InFileName);

           ShellStatus = SHELL_INVALID_PARAMETER;

         }

-        if (ShellIsDirectory(OutFileName) == EFI_SUCCESS){

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, L"eficompress", OutFileName);

+

+        if (ShellIsDirectory (OutFileName) == EFI_SUCCESS) {

+          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_FILE_NOT_DIR), gShellDebug1HiiHandle, L"eficompress", OutFileName);

           ShellStatus = SHELL_INVALID_PARAMETER;

         }

+

         if (ShellStatus == SHELL_SUCCESS) {

-          Status = ShellOpenFileByName(InFileName, &InShellFileHandle, EFI_FILE_MODE_READ, 0);

-          if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, L"eficompress", ShellCommandLineGetRawValue(Package, 1));

+          Status = ShellOpenFileByName (InFileName, &InShellFileHandle, EFI_FILE_MODE_READ, 0);

+          if (EFI_ERROR (Status)) {

+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, L"eficompress", ShellCommandLineGetRawValue (Package, 1));

             ShellStatus = SHELL_NOT_FOUND;

           }

-          Status = ShellOpenFileByName(OutFileName, &OutShellFileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);

-          if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, L"eficompress", ShellCommandLineGetRawValue(Package, 2));

+

+          Status = ShellOpenFileByName (OutFileName, &OutShellFileHandle, EFI_FILE_MODE_READ|EFI_FILE_MODE_WRITE|EFI_FILE_MODE_CREATE, 0);

+          if (EFI_ERROR (Status)) {

+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellDebug1HiiHandle, L"eficompress", ShellCommandLineGetRawValue (Package, 2));

             ShellStatus = SHELL_NOT_FOUND;

           }

         }

+

         if (ShellStatus == SHELL_SUCCESS) {

-          Status = gEfiShellProtocol->GetFileSize(InShellFileHandle, &InSize);

-          ASSERT_EFI_ERROR(Status);

-          InBuffer = AllocateZeroPool((UINTN)InSize);

+          Status = gEfiShellProtocol->GetFileSize (InShellFileHandle, &InSize);

+          ASSERT_EFI_ERROR (Status);

+          InBuffer = AllocateZeroPool ((UINTN)InSize);

           if (InBuffer == NULL) {

             Status = EFI_OUT_OF_RESOURCES;

           } else {

-            InSize2 = (UINTN) InSize;

-            Status = gEfiShellProtocol->ReadFile (InShellFileHandle, &InSize2, InBuffer);

-            InSize = InSize2;

+            InSize2 = (UINTN)InSize;

+            Status  = gEfiShellProtocol->ReadFile (InShellFileHandle, &InSize2, InBuffer);

+            InSize  = InSize2;

             ASSERT_EFI_ERROR (Status);

             Status = Compress (InBuffer, InSize, OutBuffer, &OutSize);

             if (Status == EFI_BUFFER_TOO_SMALL) {

-              OutBuffer = AllocateZeroPool ((UINTN) OutSize);

+              OutBuffer = AllocateZeroPool ((UINTN)OutSize);

               if (OutBuffer == NULL) {

                 Status = EFI_OUT_OF_RESOURCES;

               } else {

@@ -127,14 +131,15 @@ ShellCommandRunEfiCompress (
               }

             }

           }

-          if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_EFI_COMPRESS_FAIL), gShellDebug1HiiHandle, Status);

+

+          if (EFI_ERROR (Status)) {

+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_EFI_COMPRESS_FAIL), gShellDebug1HiiHandle, Status);

             ShellStatus = ((Status == EFI_OUT_OF_RESOURCES) ? SHELL_OUT_OF_RESOURCES : SHELL_DEVICE_ERROR);

           } else {

             OutSize2 = (UINTN)OutSize;

-            Status = gEfiShellProtocol->WriteFile(OutShellFileHandle, &OutSize2, OutBuffer);

-            if (EFI_ERROR(Status)) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_FILE_WRITE_FAIL), gShellDebug1HiiHandle, L"eficompress", OutFileName);

+            Status   = gEfiShellProtocol->WriteFile (OutShellFileHandle, &OutSize2, OutBuffer);

+            if (EFI_ERROR (Status)) {

+              ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_FILE_WRITE_FAIL), gShellDebug1HiiHandle, L"eficompress", OutFileName);

               ShellStatus = SHELL_DEVICE_ERROR;

             }

           }

@@ -144,15 +149,18 @@ ShellCommandRunEfiCompress (
 

     ShellCommandLineFreeVarList (Package);

   }

+

   if (InShellFileHandle != NULL) {

-    gEfiShellProtocol->CloseFile(InShellFileHandle);

+    gEfiShellProtocol->CloseFile (InShellFileHandle);

   }

+

   if (OutShellFileHandle != NULL) {

-    gEfiShellProtocol->CloseFile(OutShellFileHandle);

+    gEfiShellProtocol->CloseFile (OutShellFileHandle);

   }

-  SHELL_FREE_NON_NULL(InFileName);

-  SHELL_FREE_NON_NULL(InBuffer);

-  SHELL_FREE_NON_NULL(OutBuffer);

+

+  SHELL_FREE_NON_NULL (InFileName);

+  SHELL_FREE_NON_NULL (InBuffer);

+  SHELL_FREE_NON_NULL (OutBuffer);

 

   return (ShellStatus);

 }