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, 60 insertions, 51 deletions

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
index e3d7aaa..bdc6a0d 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/MkDir.c
@@ -22,129 +22,139 @@ ShellCommandRunMkDir (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_STATUS      Status;

-  CONST CHAR16    *NewDirName;

-  CHAR16          *NewDirNameCopy;

-  CHAR16          *SplitName;

-  CHAR16          SaveSplitChar;

-  UINTN           DirCreateCount;

-  LIST_ENTRY      *Package;

-  CHAR16          *ProblemParam;

-  SHELL_FILE_HANDLE          FileHandle;

-  SHELL_STATUS    ShellStatus;

-

-  ShellStatus         = SHELL_SUCCESS;

-  NewDirNameCopy      = NULL;

-  SplitName           = NULL;

-  SaveSplitChar       = CHAR_NULL;

+  EFI_STATUS         Status;

+  CONST CHAR16       *NewDirName;

+  CHAR16             *NewDirNameCopy;

+  CHAR16             *SplitName;

+  CHAR16             SaveSplitChar;

+  UINTN              DirCreateCount;

+  LIST_ENTRY         *Package;

+  CHAR16             *ProblemParam;

+  SHELL_FILE_HANDLE  FileHandle;

+  SHELL_STATUS       ShellStatus;

+

+  ShellStatus    = SHELL_SUCCESS;

+  NewDirNameCopy = NULL;

+  SplitName      = NULL;

+  SaveSplitChar  = CHAR_NULL;

   //

   // initialize the shell lib (we must be in non-auto-init...)

   //

-  Status = ShellInitialize();

-  ASSERT_EFI_ERROR(Status);

+  Status = ShellInitialize ();

+  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), gShellLevel2HiiHandle, L"mkdir", ProblemParam);

-      FreePool(ProblemParam);

+  if (EFI_ERROR (Status)) {

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

+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel2HiiHandle, L"mkdir", ProblemParam);

+      FreePool (ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

-      ASSERT(FALSE);

+      ASSERT (FALSE);

     }

   } else {

     //

     // check for "-?"

     //

-    if (ShellCommandLineGetFlag(Package, L"-?")) {

-      ASSERT(FALSE);

+    if (ShellCommandLineGetFlag (Package, L"-?")) {

+      ASSERT (FALSE);

     }

 

     //

     // create a set of directories

     //

-    if (ShellCommandLineGetRawValue(Package, 1) == NULL) {

+    if (ShellCommandLineGetRawValue (Package, 1) == NULL) {

       //

       // we didnt get a single parameter

       //

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mkdir");

+      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel2HiiHandle, L"mkdir");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       for ( DirCreateCount = 1

-          ;

-          ; DirCreateCount++

-       ){

+            ;

+            ; DirCreateCount++

+            )

+      {

         //

         // loop through each directory specified

         //

 

-        NewDirName = ShellCommandLineGetRawValue(Package, DirCreateCount);

+        NewDirName = ShellCommandLineGetRawValue (Package, DirCreateCount);

         if (NewDirName == NULL) {

           break;

         }

+

         //

         // check if that already exists... if yes fail

         //

         FileHandle = NULL;

-        Status = ShellOpenFileByName(NewDirName,

-                                    &FileHandle,

-                                    EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE,

-                                    EFI_FILE_DIRECTORY

-                                   );

-        if (!EFI_ERROR(Status)) {

-          ShellCloseFile(&FileHandle);

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MKDIR_ALREADY), gShellLevel2HiiHandle, NewDirName);

+        Status     = ShellOpenFileByName (

+                       NewDirName,

+                       &FileHandle,

+                       EFI_FILE_MODE_READ | EFI_FILE_MODE_WRITE,

+                       EFI_FILE_DIRECTORY

+                       );

+        if (!EFI_ERROR (Status)) {

+          ShellCloseFile (&FileHandle);

+          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MKDIR_ALREADY), gShellLevel2HiiHandle, NewDirName);

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

-          ASSERT(FileHandle == NULL);

+          ASSERT (FileHandle == NULL);

           //

           // create the nested directory from parent to child.

           // if NewDirName = test1\test2\test3, first create "test1\" directory, then "test1\test2\", finally "test1\test2\test3".

           //

-          NewDirNameCopy = AllocateCopyPool (StrSize(NewDirName), NewDirName);

+          NewDirNameCopy = AllocateCopyPool (StrSize (NewDirName), NewDirName);

           NewDirNameCopy = PathCleanUpDirectories (NewDirNameCopy);

-          if(NewDirNameCopy == NULL) {

+          if (NewDirNameCopy == NULL) {

             ShellStatus = SHELL_OUT_OF_RESOURCES;

             break;

           }

+

           SplitName = NewDirNameCopy;

           while (SplitName != NULL) {

             SplitName = StrStr (SplitName + 1, L"\\");

             if (SplitName != NULL) {

-              SaveSplitChar = *(SplitName + 1);

+              SaveSplitChar    = *(SplitName + 1);

               *(SplitName + 1) = '\0';

             }

+

             //

             // check if current nested directory already exists... continue to create the child directory.

             //

-            Status = ShellOpenFileByName (NewDirNameCopy,

-                                    &FileHandle,

-                                    EFI_FILE_MODE_READ,

-                                    EFI_FILE_DIRECTORY

-                                    );

-            if (!EFI_ERROR(Status)) {

+            Status = ShellOpenFileByName (

+                       NewDirNameCopy,

+                       &FileHandle,

+                       EFI_FILE_MODE_READ,

+                       EFI_FILE_DIRECTORY

+                       );

+            if (!EFI_ERROR (Status)) {

               ShellCloseFile (&FileHandle);

             } else {

               Status = ShellCreateDirectory (NewDirNameCopy, &FileHandle);

-              if (EFI_ERROR(Status)) {

+              if (EFI_ERROR (Status)) {

                 break;

               }

+

               if (FileHandle != NULL) {

                 gEfiShellProtocol->CloseFile (FileHandle);

               }

             }

+

             if (SplitName != NULL) {

               *(SplitName + 1) = SaveSplitChar;

             }

           }

-          if (EFI_ERROR(Status)) {

+

+          if (EFI_ERROR (Status)) {

             ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MKDIR_CREATEFAIL), gShellLevel2HiiHandle, NewDirName);

             ShellStatus = SHELL_ACCESS_DENIED;

             break;

           }

+

           SHELL_FREE_NON_NULL (NewDirNameCopy);

         }

       }

@@ -158,4 +168,3 @@ ShellCommandRunMkDir (
 

   return (ShellStatus);

 }

-