ShellPkg: Clean up source files

1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

7 files changed, 163 insertions, 163 deletions

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
index 9824977149..8da07825f6 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
@@ -89,13 +89,13 @@ ShellCommandRunEndFor (
   if (!Found) {

     CurrentScriptFile = ShellCommandGetCurrentScriptFile();

     ShellPrintHiiEx(

-      -1, 

-      -1, 

-      NULL, 

-      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-      gShellLevel1HiiHandle, 

-      L"For", 

-      L"EndFor", 

+      -1,

+      -1,

+      NULL,

+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+      gShellLevel1HiiHandle,

+      L"For",

+      L"EndFor",

       CurrentScriptFile!=NULL

         && CurrentScriptFile->CurrentCommand!=NULL

           ? CurrentScriptFile->CurrentCommand->Line:0);

@@ -339,13 +339,13 @@ ShellCommandRunFor (
     //

     if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, TRUE, FALSE)) {

       ShellPrintHiiEx(

-        -1, 

-        -1, 

-        NULL, 

-        STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-        gShellLevel1HiiHandle, 

-        L"EndFor", 

-        L"For", 

+        -1,

+        -1,

+        NULL,

+        STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+        gShellLevel1HiiHandle,

+        L"EndFor",

+        L"For",

         CurrentScriptFile->CurrentCommand->Line);

       return (SHELL_DEVICE_ERROR);

     }

@@ -467,12 +467,12 @@ ShellCommandRunFor (
         ArgSetWalker            = ArgSet;

         if (ArgSetWalker[0] != L'(') {

           ShellPrintHiiEx(

-            -1, 

-            -1, 

-            NULL, 

-            STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 

-            gShellLevel1HiiHandle, 

-            ArgSet, 

+            -1,

+            -1,

+            NULL,

+            STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),

+            gShellLevel1HiiHandle,

+            ArgSet,

             CurrentScriptFile->CurrentCommand->Line);

           ShellStatus = SHELL_INVALID_PARAMETER;

         } else {

@@ -490,11 +490,11 @@ ShellCommandRunFor (
           }

           if (TempSpot == NULL) {

             ShellPrintHiiEx(

-              -1, 

-              -1, 

-              NULL, 

-              STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 

-              gShellLevel1HiiHandle, 

+              -1,

+              -1,

+              NULL,

+              STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),

+              gShellLevel1HiiHandle,

               CurrentScriptFile->CurrentCommand->Line);

             ShellStatus = SHELL_INVALID_PARAMETER;

           } else {

@@ -505,12 +505,12 @@ ShellCommandRunFor (
             }

             if (!ShellIsValidForNumber(ArgSetWalker)) {

               ShellPrintHiiEx(

-                -1, 

-                -1, 

-                NULL, 

-                STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 

-                gShellLevel1HiiHandle, 

-                ArgSet, 

+                -1,

+                -1,

+                NULL,

+                STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),

+                gShellLevel1HiiHandle,

+                ArgSet,

                 CurrentScriptFile->CurrentCommand->Line);

               ShellStatus = SHELL_INVALID_PARAMETER;

             } else {

@@ -525,12 +525,12 @@ ShellCommandRunFor (
               }

               if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){

                 ShellPrintHiiEx(

-                  -1, 

-                  -1, 

-                  NULL, 

-                  STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 

-                  gShellLevel1HiiHandle, 

-                  ArgSet, 

+                  -1,

+                  -1,

+                  NULL,

+                  STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),

+                  gShellLevel1HiiHandle,

+                  ArgSet,

                   CurrentScriptFile->CurrentCommand->Line);

                 ShellStatus = SHELL_INVALID_PARAMETER;

               } else {

@@ -552,12 +552,12 @@ ShellCommandRunFor (
                 if (ArgSetWalker != NULL && *ArgSetWalker != CHAR_NULL) {

                   if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){

                     ShellPrintHiiEx(

-                      -1, 

-                      -1, 

-                      NULL, 

-                      STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 

-                      gShellLevel1HiiHandle, 

-                      ArgSet, 

+                      -1,

+                      -1,

+                      NULL,

+                      STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),

+                      gShellLevel1HiiHandle,

+                      ArgSet,

                       CurrentScriptFile->CurrentCommand->Line);

                     ShellStatus = SHELL_INVALID_PARAMETER;

                   } else {

@@ -572,18 +572,18 @@ ShellCommandRunFor (
 

                       if (StrStr(ArgSetWalker, L" ") != NULL) {

                         ShellPrintHiiEx(

-                          -1, 

-                          -1, 

-                          NULL, 

-                          STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 

-                          gShellLevel1HiiHandle, 

-                          ArgSet, 

+                          -1,

+                          -1,

+                          NULL,

+                          STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),

+                          gShellLevel1HiiHandle,

+                          ArgSet,

                           CurrentScriptFile->CurrentCommand->Line);

                         ShellStatus = SHELL_INVALID_PARAMETER;

                       }

                     }

                   }

-                  

+

                 }

               }

             }

@@ -602,13 +602,13 @@ ShellCommandRunFor (
       }

     } else {

       ShellPrintHiiEx(

-        -1, 

-        -1, 

-        NULL, 

-        STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), 

-        gShellLevel1HiiHandle, 

-        ArgSet, 

-        CurrentScriptFile!=NULL 

+        -1,

+        -1,

+        NULL,

+        STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT),

+        gShellLevel1HiiHandle,

+        ArgSet,

+        CurrentScriptFile!=NULL

           && CurrentScriptFile->CurrentCommand!=NULL

           ? CurrentScriptFile->CurrentCommand->Line:0);

       ShellStatus = SHELL_INVALID_PARAMETER;

@@ -659,14 +659,14 @@ ShellCommandRunFor (
         //

         if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {

           ShellPrintHiiEx(

-            -1, 

-            -1, 

-            NULL, 

-            STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-            gShellLevel1HiiHandle, 

-            L"EndFor", 

-            L"For", 

-            CurrentScriptFile!=NULL 

+            -1,

+            -1,

+            NULL,

+            STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+            gShellLevel1HiiHandle,

+            L"EndFor",

+            L"For",

+            CurrentScriptFile!=NULL

               && CurrentScriptFile->CurrentCommand!=NULL

               ? CurrentScriptFile->CurrentCommand->Line:0);

           ShellStatus = SHELL_DEVICE_ERROR;

@@ -721,14 +721,14 @@ ShellCommandRunFor (
         //

         if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {

           ShellPrintHiiEx(

-            -1, 

-            -1, 

-            NULL, 

-            STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-            gShellLevel1HiiHandle, 

-            L"EndFor", 

-            L"For", 

-            CurrentScriptFile!=NULL 

+            -1,

+            -1,

+            NULL,

+            STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+            gShellLevel1HiiHandle,

+            L"EndFor",

+            L"For",

+            CurrentScriptFile!=NULL

               && CurrentScriptFile->CurrentCommand!=NULL

               ? CurrentScriptFile->CurrentCommand->Line:0);

           ShellStatus = SHELL_DEVICE_ERROR;

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
index 88e290daa7..04083bbc1c 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/Goto.c
@@ -2,7 +2,7 @@
   Main file for goto shell level 1 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -83,14 +83,14 @@ ShellCommandRunGoto (
       if (!MoveToTag(GetNextNode, L"endfor", L"for", CompareString, ShellCommandGetCurrentScriptFile(), FALSE, FALSE, TRUE)) {

         CurrentScriptFile = ShellCommandGetCurrentScriptFile();

         ShellPrintHiiEx(

-          -1, 

-          -1, 

-          NULL, 

-          STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-          gShellLevel1HiiHandle, 

-          CompareString, 

-          L"Goto", 

-          CurrentScriptFile!=NULL 

+          -1,

+          -1,

+          NULL,

+          STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+          gShellLevel1HiiHandle,

+          CompareString,

+          L"Goto",

+          CurrentScriptFile!=NULL

             && CurrentScriptFile->CurrentCommand!=NULL

             ? CurrentScriptFile->CurrentCommand->Line:0);

         ShellStatus = SHELL_NOT_FOUND;

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
index 35c5ca6835..14380601ca 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/If.c
@@ -2,7 +2,7 @@
   Main file for If and else shell level 1 function.

 

   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -335,7 +335,7 @@ TestOperation (
 /**

   Process an if statement and determine if its is valid or not.

 

-  @param[in, out] PassingState     Opon entry, the current state.  Upon exit, 

+  @param[in, out] PassingState     Opon entry, the current state.  Upon exit,

                                    the new state.

   @param[in] StartParameterNumber  The number of the first parameter of

                                    this statement.

@@ -346,7 +346,7 @@ TestOperation (
   @param[in] ForceStringCompare    TRUE for all string based, FALSE otherwise.

 

   @retval EFI_INVALID_PARAMETER   A parameter was invalid.

-  @retval EFI_SUCCESS             The operation was successful.                                  

+  @retval EFI_SUCCESS             The operation was successful.

 **/

 EFI_STATUS

 ProcessStatement (

@@ -649,9 +649,9 @@ ProcessStatement (
   Break up the next part of the if statement (until the next 'and', 'or', or 'then').

 

   @param[in] ParameterNumber      The current parameter number.

-  @param[out] EndParameter        Upon successful return, will point to the 

+  @param[out] EndParameter        Upon successful return, will point to the

                                   parameter to start the next iteration with.

-  @param[out] EndTag              Upon successful return, will point to the 

+  @param[out] EndTag              Upon successful return, will point to the

                                   type that was found at the end of this statement.

 

   @retval TRUE    A valid statement was found.

@@ -837,12 +837,12 @@ ShellCommandRunIf (
   ASSERT_EFI_ERROR(Status);

 

   if (!gEfiShellProtocol->BatchIsActive()) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"if");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"if");

     return (SHELL_UNSUPPORTED);

   }

 

   if (gEfiShellParametersProtocol->Argc < 3) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"if");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"if");

     return (SHELL_INVALID_PARAMETER);

   }

 

@@ -852,14 +852,14 @@ ShellCommandRunIf (
   CurrentScriptFile = ShellCommandGetCurrentScriptFile();

   if (!MoveToTag(GetNextNode, L"endif", L"if", NULL, CurrentScriptFile, TRUE, TRUE, FALSE)) {

     ShellPrintHiiEx(

-      -1, 

-      -1, 

-      NULL, 

-      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-      gShellLevel1HiiHandle, 

-      L"EndIf", 

-      L"If", 

-      CurrentScriptFile!=NULL 

+      -1,

+      -1,

+      NULL,

+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+      gShellLevel1HiiHandle,

+      L"EndIf",

+      L"If",

+      CurrentScriptFile!=NULL

         && CurrentScriptFile->CurrentCommand!=NULL

         ? CurrentScriptFile->CurrentCommand->Line:0);

     return (SHELL_DEVICE_ERROR);

@@ -920,12 +920,12 @@ ShellCommandRunIf (
       // we are at the then

       //

       if (CurrentParameter+1 != gEfiShellParametersProtocol->Argc) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TEXT_AFTER_THEN), gShellLevel1HiiHandle, L"if");  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_TEXT_AFTER_THEN), gShellLevel1HiiHandle, L"if");

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         Status = PerformResultOperation(CurrentValue);

         if (EFI_ERROR(Status)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_AFTER_BAD), gShellLevel1HiiHandle, L"if", gEfiShellParametersProtocol->Argv[CurrentParameter]);  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_AFTER_BAD), gShellLevel1HiiHandle, L"if", gEfiShellParametersProtocol->Argv[CurrentParameter]);

           ShellStatus = SHELL_INVALID_PARAMETER;

         }

       }

@@ -937,14 +937,14 @@ ShellCommandRunIf (
       if (!BuildNextStatement(CurrentParameter, &EndParameter, &Ending)) {

         CurrentScriptFile = ShellCommandGetCurrentScriptFile();

         ShellPrintHiiEx(

-          -1, 

-          -1, 

-          NULL, 

-          STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-          gShellLevel1HiiHandle, 

-          L"Then", 

+          -1,

+          -1,

+          NULL,

+          STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+          gShellLevel1HiiHandle,

+          L"Then",

           L"If",

-          CurrentScriptFile!=NULL 

+          CurrentScriptFile!=NULL

             && CurrentScriptFile->CurrentCommand!=NULL

             ? CurrentScriptFile->CurrentCommand->Line:0);

         ShellStatus = SHELL_INVALID_PARAMETER;

@@ -963,7 +963,7 @@ ShellCommandRunIf (
           if ((Ending == EndTagOr && CurrentValue) || (Ending == EndTagAnd && !CurrentValue)) {

             Status = PerformResultOperation(CurrentValue);

             if (EFI_ERROR(Status)) {

-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_AFTER_BAD), gShellLevel1HiiHandle, L"if", gEfiShellParametersProtocol->Argv[CurrentParameter]);  

+              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_AFTER_BAD), gShellLevel1HiiHandle, L"if", gEfiShellParametersProtocol->Argv[CurrentParameter]);

               ShellStatus = SHELL_INVALID_PARAMETER;

             }

             break;

@@ -1004,7 +1004,7 @@ ShellCommandRunElse (
   ASSERT_EFI_ERROR (Status);

 

   if (gEfiShellParametersProtocol->Argc > 1) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if");

     return (SHELL_INVALID_PARAMETER);

   }

 

@@ -1017,28 +1017,28 @@ ShellCommandRunElse (
 

   if (!MoveToTag(GetPreviousNode, L"if", L"endif", NULL, CurrentScriptFile, FALSE, TRUE, FALSE)) {

     ShellPrintHiiEx(

-      -1, 

-      -1, 

-      NULL, 

-      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-      gShellLevel1HiiHandle, 

-      L"If", 

-      L"Else", 

-      CurrentScriptFile!=NULL 

+      -1,

+      -1,

+      NULL,

+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+      gShellLevel1HiiHandle,

+      L"If",

+      L"Else",

+      CurrentScriptFile!=NULL

         && CurrentScriptFile->CurrentCommand!=NULL

         ? CurrentScriptFile->CurrentCommand->Line:0);

     return (SHELL_DEVICE_ERROR);

   }

   if (!MoveToTag(GetPreviousNode, L"if", L"else", NULL, CurrentScriptFile, FALSE, TRUE, FALSE)) {

     ShellPrintHiiEx(

-      -1, 

-      -1, 

-      NULL, 

-      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-      gShellLevel1HiiHandle, 

-      L"If", 

-      L"Else", 

-      CurrentScriptFile!=NULL 

+      -1,

+      -1,

+      NULL,

+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+      gShellLevel1HiiHandle,

+      L"If",

+      L"Else",

+      CurrentScriptFile!=NULL

         && CurrentScriptFile->CurrentCommand!=NULL

         ? CurrentScriptFile->CurrentCommand->Line:0);

     return (SHELL_DEVICE_ERROR);

@@ -1046,14 +1046,14 @@ ShellCommandRunElse (
 

   if (!MoveToTag(GetNextNode, L"endif", L"if", NULL, CurrentScriptFile, FALSE, FALSE, FALSE)) {

     ShellPrintHiiEx(

-      -1, 

-      -1, 

-      NULL, 

-      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-      gShellLevel1HiiHandle, 

-      L"EndIf", 

-      "Else", 

-      CurrentScriptFile!=NULL 

+      -1,

+      -1,

+      NULL,

+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+      gShellLevel1HiiHandle,

+      L"EndIf",

+      "Else",

+      CurrentScriptFile!=NULL

         && CurrentScriptFile->CurrentCommand!=NULL

         ? CurrentScriptFile->CurrentCommand->Line:0);

     return (SHELL_DEVICE_ERROR);

@@ -1082,7 +1082,7 @@ ShellCommandRunEndIf (
   ASSERT_EFI_ERROR (Status);

 

   if (gEfiShellParametersProtocol->Argc > 1) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"if");

     return (SHELL_INVALID_PARAMETER);

   }

 

@@ -1094,14 +1094,14 @@ ShellCommandRunEndIf (
   CurrentScriptFile = ShellCommandGetCurrentScriptFile();

   if (!MoveToTag(GetPreviousNode, L"if", L"endif", NULL, CurrentScriptFile, FALSE, TRUE, FALSE)) {

     ShellPrintHiiEx(

-      -1, 

-      -1, 

-      NULL, 

-      STRING_TOKEN (STR_SYNTAX_NO_MATCHING), 

-      gShellLevel1HiiHandle, 

-      L"If", 

-      L"EndIf", 

-      CurrentScriptFile!=NULL 

+      -1,

+      -1,

+      NULL,

+      STRING_TOKEN (STR_SYNTAX_NO_MATCHING),

+      gShellLevel1HiiHandle,

+      L"If",

+      L"EndIf",

+      CurrentScriptFile!=NULL

         && CurrentScriptFile->CurrentCommand!=NULL

         ? CurrentScriptFile->CurrentCommand->Line:0);

     return (SHELL_DEVICE_ERROR);

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c
index 08c54f8f7a..a6f59f668c 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/Shift.c
@@ -2,7 +2,7 @@
   Main file for Shift shell level 1 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -36,7 +36,7 @@ ShellCommandRunShift (
   ASSERT_EFI_ERROR(Status);

 

   if (!gEfiShellProtocol->BatchIsActive()) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"shift");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_NO_SCRIPT), gShellLevel1HiiHandle, L"shift");

     return (SHELL_UNSUPPORTED);

   }

 

@@ -44,7 +44,7 @@ ShellCommandRunShift (
   ASSERT(CurrentScriptFile != NULL);

 

   if (CurrentScriptFile->Argc < 2) {

-    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"shift");  

+    ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"shift");

     return (SHELL_UNSUPPORTED);

   }

 

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c
index 476b1bc47f..4306d7fca7 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/Stall.c
@@ -2,7 +2,7 @@
   Main file for stall shell level 1 function.

 

   (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -51,7 +51,7 @@ ShellCommandRunStall (
   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), gShellLevel1HiiHandle, L"stall", ProblemParam);  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellLevel1HiiHandle, L"stall", ProblemParam);

       FreePool(ProblemParam);

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

@@ -59,20 +59,20 @@ ShellCommandRunStall (
     }

   } else {

     if (ShellCommandLineGetRawValue(Package, 2) != NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"stall");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellLevel1HiiHandle, L"stall");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else if (ShellCommandLineGetRawValue(Package, 1) == NULL) {

-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"stall");  

+      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_FEW), gShellLevel1HiiHandle, L"stall");

       ShellStatus = SHELL_INVALID_PARAMETER;

     } else {

       Status = ShellConvertStringToUint64(ShellCommandLineGetRawValue(Package, 1), &Intermediate, FALSE, FALSE);

       if (EFI_ERROR(Status) || ((UINT64)(UINTN)(Intermediate)) != Intermediate) {

-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel1HiiHandle, L"stall", ShellCommandLineGetRawValue(Package, 1));  

+        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellLevel1HiiHandle, L"stall", ShellCommandLineGetRawValue(Package, 1));

         ShellStatus = SHELL_INVALID_PARAMETER;

       } else {

         Status = gBS->Stall((UINTN)Intermediate);

         if (EFI_ERROR(Status)) {

-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_STALL_FAILED), gShellLevel1HiiHandle, L"stall");  

+          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_STALL_FAILED), gShellLevel1HiiHandle, L"stall");

           ShellStatus = SHELL_DEVICE_ERROR;

         }

       }

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
index 2b8a104da3..c6c2e9787e 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.c
@@ -2,7 +2,7 @@
   Main file for NULL named library for level 1 shell command functions.

 

   (C) Copyright 2013 Hewlett-Packard Development Company, L.P.<BR>

-  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -103,18 +103,18 @@ ShellLevel1CommandsLibDestructor (
   It functions so that count starts at 1 and it increases or decreases when it

   hits the specified tags.  when it hits zero the location has been found.

 

-  DecrementerTag and IncrementerTag are used to get around for/endfor and 

+  DecrementerTag and IncrementerTag are used to get around for/endfor and

   similar paired types where the entire middle should be ignored.

 

   If label is used it will be used instead of the count.

 

-  @param[in] Function          The function to use to enumerate through the 

+  @param[in] Function          The function to use to enumerate through the

                                list.  Normally GetNextNode or GetPreviousNode.

   @param[in] DecrementerTag    The tag to decrement the count at.

   @param[in] IncrementerTag    The tag to increment the count at.

   @param[in] Label             A label to look for.

   @param[in, out] ScriptFile   The pointer to the current script file structure.

-  @param[in] MovePast          TRUE makes function return 1 past the found 

+  @param[in] MovePast          TRUE makes function return 1 past the found

                                location.

   @param[in] FindOnly          TRUE to not change the ScriptFile.

   @param[in] CommandNode       The pointer to the Node to test.

@@ -227,21 +227,21 @@ TestNodeForMove (
   It functions so that count starts at 1 and it increases or decreases when it

   hits the specified tags.  when it hits zero the location has been found.

 

-  DecrementerTag and IncrementerTag are used to get around for/endfor and 

+  DecrementerTag and IncrementerTag are used to get around for/endfor and

   similar paired types where the entire middle should be ignored.

 

   If label is used it will be used instead of the count.

 

-  @param[in] Function          The function to use to enumerate through the 

+  @param[in] Function          The function to use to enumerate through the

                                list.  Normally GetNextNode or GetPreviousNode.

   @param[in] DecrementerTag    The tag to decrement the count at.

   @param[in] IncrementerTag    The tag to increment the count at.

   @param[in] Label             A label to look for.

   @param[in, out] ScriptFile   The pointer to the current script file structure.

-  @param[in] MovePast          TRUE makes function return 1 past the found 

+  @param[in] MovePast          TRUE makes function return 1 past the found

                                location.

   @param[in] FindOnly          TRUE to not change the ScriptFile.

-  @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in 

+  @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in

                                searching.

 **/

 BOOLEAN

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
index 04892a6f01..9106082ab7 100644
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/UefiShellLevel1CommandsLib.h
@@ -1,7 +1,7 @@
 /** @file

   Main file for NULL named library for level 1 shell command functions.

 

-  Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -176,21 +176,21 @@ LIST_ENTRY *
   It functions so that count starts at 1 and it increases or decreases when it

   hits the specified tags.  when it hits zero the location has been found.

 

-  DecrementerTag and IncrementerTag are used to get around for/endfor and 

+  DecrementerTag and IncrementerTag are used to get around for/endfor and

   similar paired types where the entire middle should be ignored.

 

   If label is used it will be used instead of the count.

 

-  @param[in] Function          The function to use to enumerate through the 

+  @param[in] Function          The function to use to enumerate through the

                                list.  Normally GetNextNode or GetPreviousNode.

   @param[in] DecrementerTag    The tag to decrement the count at.

   @param[in] IncrementerTag    The tag to increment the count at.

   @param[in] Label             A label to look for.

   @param[in, out] ScriptFile   The pointer to the current script file structure.

-  @param[in] MovePast          TRUE makes function return 1 past the found 

+  @param[in] MovePast          TRUE makes function return 1 past the found

                                location.

   @param[in] FindOnly          TRUE to not change the ScriptFile.

-  @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in 

+  @param[in] WrapAroundScript  TRUE to wrap end-to-begining or vise versa in

                                searching.

 **/

 BOOLEAN