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, 115 insertions, 101 deletions

diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c b/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c
index a5950b4e4b..724dc808ae 100644
--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c
+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Attrib.c
@@ -9,19 +9,19 @@
 

 #include "UefiShellLevel2CommandsLib.h"

 

-STATIC CONST CHAR16 AllFiles[] = L"*";

-

-STATIC CONST SHELL_PARAM_ITEM AttribParamList[] = {

-  {L"-a", TypeFlag},

-  {L"+a", TypeFlag},

-  {L"-s", TypeFlag},

-  {L"+s", TypeFlag},

-  {L"-h", TypeFlag},

-  {L"+h", TypeFlag},

-  {L"-r", TypeFlag},

-  {L"+r", TypeFlag},

-  {NULL, TypeMax}

-  };

+STATIC CONST CHAR16  AllFiles[] = L"*";

+

+STATIC CONST SHELL_PARAM_ITEM  AttribParamList[] = {

+  { L"-a", TypeFlag },

+  { L"+a", TypeFlag },

+  { L"-s", TypeFlag },

+  { L"+s", TypeFlag },

+  { L"-h", TypeFlag },

+  { L"+h", TypeFlag },

+  { L"-r", TypeFlag },

+  { L"+r", TypeFlag },

+  { NULL,  TypeMax  }

+};

 

 /**

   Function for 'attrib' command.

@@ -36,127 +36,137 @@ ShellCommandRunAttrib (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  UINT64              FileAttributesToAdd;

-  UINT64              FileAttributesToRemove;

-  EFI_STATUS          Status;

-  LIST_ENTRY          *Package;

-  CHAR16              *ProblemParam;

-  SHELL_STATUS        ShellStatus;

-  UINTN               ParamNumberCount;

-  CONST CHAR16        *FileName;

-  EFI_SHELL_FILE_INFO *ListOfFiles;

-  EFI_SHELL_FILE_INFO *FileNode;

-  EFI_FILE_INFO       *FileInfo;

-

-  ListOfFiles   = NULL;

-  ShellStatus   = SHELL_SUCCESS;

-  ProblemParam  = NULL;

+  UINT64               FileAttributesToAdd;

+  UINT64               FileAttributesToRemove;

+  EFI_STATUS           Status;

+  LIST_ENTRY           *Package;

+  CHAR16               *ProblemParam;

+  SHELL_STATUS         ShellStatus;

+  UINTN                ParamNumberCount;

+  CONST CHAR16         *FileName;

+  EFI_SHELL_FILE_INFO  *ListOfFiles;

+  EFI_SHELL_FILE_INFO  *FileNode;

+  EFI_FILE_INFO        *FileInfo;

+

+  ListOfFiles  = NULL;

+  ShellStatus  = SHELL_SUCCESS;

+  ProblemParam = 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 (AttribParamList, &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"attrib", 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"attrib", 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);

     } else {

-      FileAttributesToAdd = 0;

+      FileAttributesToAdd    = 0;

       FileAttributesToRemove = 0;

 

       //

       // apply or remove each flag

       //

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

+      if (ShellCommandLineGetFlag (Package, L"+a")) {

         FileAttributesToAdd |= EFI_FILE_ARCHIVE;

       }

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

+

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

         FileAttributesToRemove |= EFI_FILE_ARCHIVE;

       }

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

+

+      if (ShellCommandLineGetFlag (Package, L"+s")) {

         FileAttributesToAdd |= EFI_FILE_SYSTEM;

       }

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

+

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

         FileAttributesToRemove |= EFI_FILE_SYSTEM;

       }

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

+

+      if (ShellCommandLineGetFlag (Package, L"+h")) {

         FileAttributesToAdd |= EFI_FILE_HIDDEN;

       }

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

+

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

         FileAttributesToRemove |= EFI_FILE_HIDDEN;

       }

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

+

+      if (ShellCommandLineGetFlag (Package, L"+r")) {

         FileAttributesToAdd |= EFI_FILE_READ_ONLY;

       }

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

+

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

         FileAttributesToRemove |= EFI_FILE_READ_ONLY;

       }

 

-      if (FileAttributesToRemove == 0 && FileAttributesToAdd == 0) {

+      if ((FileAttributesToRemove == 0) && (FileAttributesToAdd == 0)) {

         //

         // Do display as we have no attributes to change

         //

         for ( ParamNumberCount = 1

-            ;

-            ; ParamNumberCount++

-           ){

-          FileName = ShellCommandLineGetRawValue(Package, ParamNumberCount);

+              ;

+              ; ParamNumberCount++

+              )

+        {

+          FileName = ShellCommandLineGetRawValue (Package, ParamNumberCount);

           // if we dont have anything left, move on...

-          if (FileName == NULL && ParamNumberCount == 1) {

-            FileName = (CHAR16*)AllFiles;

+          if ((FileName == NULL) && (ParamNumberCount == 1)) {

+            FileName = (CHAR16 *)AllFiles;

           } else if (FileName == NULL) {

             break;

           }

-          ASSERT(ListOfFiles == NULL);

-          Status = ShellOpenFileMetaArg((CHAR16*)FileName, EFI_FILE_MODE_READ, &ListOfFiles);

-          if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

+

+          ASSERT (ListOfFiles == NULL);

+          Status = ShellOpenFileMetaArg ((CHAR16 *)FileName, EFI_FILE_MODE_READ, &ListOfFiles);

+          if (EFI_ERROR (Status)) {

+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue (Package, ParamNumberCount));

             ShellStatus = SHELL_NOT_FOUND;

           } else {

-            for (FileNode = (EFI_SHELL_FILE_INFO*)GetFirstNode(&ListOfFiles->Link)

-              ;  !IsNull(&ListOfFiles->Link, &FileNode->Link)

-              ;  FileNode = (EFI_SHELL_FILE_INFO*)GetNextNode(&ListOfFiles->Link, &FileNode->Link)

-             ){

-              ShellPrintHiiEx(

+            for (FileNode = (EFI_SHELL_FILE_INFO *)GetFirstNode (&ListOfFiles->Link)

+                 ; !IsNull (&ListOfFiles->Link, &FileNode->Link)

+                 ; FileNode = (EFI_SHELL_FILE_INFO *)GetNextNode (&ListOfFiles->Link, &FileNode->Link)

+                 )

+            {

+              ShellPrintHiiEx (

                 -1,

                 -1,

                 NULL,

                 STRING_TOKEN (STR_ATTRIB_OUTPUT_LINE),

                 gShellLevel2HiiHandle,

-                FileNode->Info->Attribute&EFI_FILE_DIRECTORY? L'D':L' ',

-                FileNode->Info->Attribute&EFI_FILE_ARCHIVE?   L'A':L' ',

-                FileNode->Info->Attribute&EFI_FILE_SYSTEM?    L'S':L' ',

-                FileNode->Info->Attribute&EFI_FILE_HIDDEN?    L'H':L' ',

-                FileNode->Info->Attribute&EFI_FILE_READ_ONLY? L'R':L' ',

+                FileNode->Info->Attribute&EFI_FILE_DIRECTORY ? L'D' : L' ',

+                FileNode->Info->Attribute&EFI_FILE_ARCHIVE ?   L'A' : L' ',

+                FileNode->Info->Attribute&EFI_FILE_SYSTEM ?    L'S' : L' ',

+                FileNode->Info->Attribute&EFI_FILE_HIDDEN ?    L'H' : L' ',

+                FileNode->Info->Attribute&EFI_FILE_READ_ONLY ? L'R' : L' ',

                 FileNode->FileName

-               );

+                );

 

-              if (ShellGetExecutionBreakFlag()) {

-                  ShellStatus = SHELL_ABORTED;

-                  break;

+              if (ShellGetExecutionBreakFlag ()) {

+                ShellStatus = SHELL_ABORTED;

+                break;

               }

             }

-            Status = ShellCloseFileMetaArg(&ListOfFiles);

+

+            Status      = ShellCloseFileMetaArg (&ListOfFiles);

             ListOfFiles = NULL;

-            if (EFI_ERROR(Status)) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

+            if (EFI_ERROR (Status)) {

+              ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue (Package, ParamNumberCount));

               ShellStatus = SHELL_NOT_FOUND;

             }

           } // for loop for handling wildcard filenames

@@ -165,26 +175,28 @@ ShellCommandRunAttrib (
         //

         // fail as we have conflcting params.

         //

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"attrib");

+        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_CON), gShellLevel2HiiHandle, L"attrib");

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         //

         // enumerate through all the files/directories and apply the attributes

         //

         for ( ParamNumberCount = 1

-            ;

-            ; ParamNumberCount++

-           ){

-          FileName = ShellCommandLineGetRawValue(Package, ParamNumberCount);

+              ;

+              ; ParamNumberCount++

+              )

+        {

+          FileName = ShellCommandLineGetRawValue (Package, ParamNumberCount);

           // if we dont have anything left, move on...

           if (FileName == NULL) {

             //

             // make sure we are not failing on the first one we do... if yes that's an error...

             //

             if (ParamNumberCount == 1) {

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

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

               ShellStatus = SHELL_INVALID_PARAMETER;

             }

+

             break;

           }

 

@@ -196,24 +208,25 @@ ShellCommandRunAttrib (
           //

           // Open the file(s)

           //

-          ASSERT(ListOfFiles == NULL);

-          Status = ShellOpenFileMetaArg((CHAR16*)FileName, EFI_FILE_MODE_READ, &ListOfFiles);

-          if (EFI_ERROR(Status)) {

-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

+          ASSERT (ListOfFiles == NULL);

+          Status = ShellOpenFileMetaArg ((CHAR16 *)FileName, EFI_FILE_MODE_READ, &ListOfFiles);

+          if (EFI_ERROR (Status)) {

+            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_OPEN_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue (Package, ParamNumberCount));

             ShellStatus = SHELL_NOT_FOUND;

           } else {

-            for (FileNode = (EFI_SHELL_FILE_INFO*)GetFirstNode(&ListOfFiles->Link)

-              ;  !IsNull(&ListOfFiles->Link, &FileNode->Link)

-              ;  FileNode = (EFI_SHELL_FILE_INFO*)GetNextNode(&ListOfFiles->Link, &FileNode->Link)

-             ){

+            for (FileNode = (EFI_SHELL_FILE_INFO *)GetFirstNode (&ListOfFiles->Link)

+                 ; !IsNull (&ListOfFiles->Link, &FileNode->Link)

+                 ; FileNode = (EFI_SHELL_FILE_INFO *)GetNextNode (&ListOfFiles->Link, &FileNode->Link)

+                 )

+            {

               //

               // skip the directory traversing stuff...

               //

-              if (StrCmp(FileNode->FileName, L".") == 0 || StrCmp(FileNode->FileName, L"..") == 0) {

+              if ((StrCmp (FileNode->FileName, L".") == 0) || (StrCmp (FileNode->FileName, L"..") == 0)) {

                 continue;

               }

 

-              FileInfo = gEfiShellProtocol->GetFileInfo(FileNode->Handle);

+              FileInfo = gEfiShellProtocol->GetFileInfo (FileNode->Handle);

 

               //

               // if we are removing Read-Only we need to do that alone

@@ -223,9 +236,9 @@ ShellCommandRunAttrib (
                 //

                 // SetFileInfo

                 //

-                Status = ShellSetFileInfo(FileNode->Handle, FileInfo);

-                if (EFI_ERROR(Status)) {

-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

+                Status = ShellSetFileInfo (FileNode->Handle, FileInfo);

+                if (EFI_ERROR (Status)) {

+                  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue (Package, ParamNumberCount));

                   ShellStatus = SHELL_ACCESS_DENIED;

                 }

               }

@@ -239,18 +252,19 @@ ShellCommandRunAttrib (
               //

               // SetFileInfo

               //

-              Status = ShellSetFileInfo(FileNode->Handle, FileInfo);

-              if (EFI_ERROR(Status)) {;

-                ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

+              Status = ShellSetFileInfo (FileNode->Handle, FileInfo);

+              if (EFI_ERROR (Status)) {

+                ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_AD), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue (Package, ParamNumberCount));

                 ShellStatus = SHELL_ACCESS_DENIED;

               }

 

-              SHELL_FREE_NON_NULL(FileInfo);

+              SHELL_FREE_NON_NULL (FileInfo);

             }

-            Status = ShellCloseFileMetaArg(&ListOfFiles);

+

+            Status      = ShellCloseFileMetaArg (&ListOfFiles);

             ListOfFiles = NULL;

-            if (EFI_ERROR(Status)) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue(Package, ParamNumberCount));

+            if (EFI_ERROR (Status)) {

+              ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_FILE_CLOSE_FAIL), gShellLevel2HiiHandle, L"attrib", ShellCommandLineGetRawValue (Package, ParamNumberCount));

               ShellStatus = SHELL_NOT_FOUND;

             }

           } // for loop for handling wildcard filenames