Comment's added and fixed.

[mirror_edk2.git] / ShellPkg / Library / UefiShellLevel1CommandsLib / For.c

diff --git a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
index ddcfd45de381cbb375db39daf08babe2f56453c2..64110099d36d8f39f08db98bbd0cd77a9103c6e9 100644 (file)
--- a/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
+++ b/ShellPkg/Library/UefiShellLevel1CommandsLib/For.c
@@ -69,6 +69,7 @@ ShellCommandRunEndFor (
 {\r
   EFI_STATUS          Status;\r
   BOOLEAN             Found;\r
+  SCRIPT_FILE         *CurrentScriptFile;\r
 \r
   Status = CommandInit();\r
   ASSERT_EFI_ERROR(Status);\r
@@ -86,6 +87,7 @@ ShellCommandRunEndFor (
   Found = MoveToTag(GetPreviousNode, L"for", L"endfor", NULL, ShellCommandGetCurrentScriptFile(), FALSE, FALSE, FALSE);\r
 \r
   if (!Found) {\r
+    CurrentScriptFile = ShellCommandGetCurrentScriptFile();\r
     ShellPrintHiiEx(\r
       -1, \r
       -1, \r
@@ -94,9 +96,9 @@ ShellCommandRunEndFor (
       gShellLevel1HiiHandle, \r
       L"For", \r
       L"EndFor", \r
-      ShellCommandGetCurrentScriptFile()!=NULL\r
-        &&ShellCommandGetCurrentScriptFile()->CurrentCommand!=NULL\r
-          ?ShellCommandGetCurrentScriptFile()->CurrentCommand->Line:0);\r
+      CurrentScriptFile!=NULL\r
+        && CurrentScriptFile->CurrentCommand!=NULL\r
+          ? CurrentScriptFile->CurrentCommand->Line:0);\r
     return (SHELL_NOT_FOUND);\r
   }\r
   return (SHELL_SUCCESS);\r
@@ -421,7 +423,16 @@ ShellCommandRunFor (
       Info->CurrentValue    = NULL;\r
       ArgSetWalker            = ArgSet;\r
       if (ArgSetWalker[0] != L'(') {\r
-        ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), gShellLevel1HiiHandle, ArgSet, ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+        ShellPrintHiiEx(\r
+          -1, \r
+          -1, \r
+          NULL, \r
+          STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
+          gShellLevel1HiiHandle, \r
+          ArgSet, \r
+          CurrentScriptFile!=NULL \r
+            && CurrentScriptFile->CurrentCommand!=NULL\r
+            ? CurrentScriptFile->CurrentCommand->Line:0);\r
         ShellStatus = SHELL_INVALID_PARAMETER;\r
       } else {\r
         TempSpot = StrStr(ArgSetWalker, L")");\r
@@ -437,7 +448,15 @@ ShellCommandRunFor (
           }\r
         }\r
         if (TempSpot == NULL) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), gShellLevel1HiiHandle, ArgSet, ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+          ShellPrintHiiEx(\r
+            -1, \r
+            -1, \r
+            NULL, \r
+            STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
+            gShellLevel1HiiHandle, \r
+            CurrentScriptFile!=NULL \r
+              && CurrentScriptFile->CurrentCommand!=NULL\r
+              ? CurrentScriptFile->CurrentCommand->Line:0);\r
           ShellStatus = SHELL_INVALID_PARAMETER;\r
         } else {\r
           *TempSpot = CHAR_NULL;\r
@@ -446,7 +465,16 @@ ShellCommandRunFor (
             ArgSetWalker++;\r
           }\r
           if (!ShellIsValidForNumber(ArgSetWalker)) {\r
-            ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), gShellLevel1HiiHandle, ArgSet, ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+            ShellPrintHiiEx(\r
+              -1, \r
+              -1, \r
+              NULL, \r
+              STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
+              gShellLevel1HiiHandle, \r
+              ArgSet, \r
+              CurrentScriptFile!=NULL \r
+                && CurrentScriptFile->CurrentCommand!=NULL\r
+                ? CurrentScriptFile->CurrentCommand->Line:0);\r
             ShellStatus = SHELL_INVALID_PARAMETER;\r
           } else {\r
             if (ArgSetWalker[0] == L'-') {\r
@@ -459,7 +487,16 @@ ShellCommandRunFor (
               ArgSetWalker++;\r
             }\r
             if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){\r
-              ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), gShellLevel1HiiHandle, ArgSet, ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+              ShellPrintHiiEx(\r
+                -1, \r
+                -1, \r
+                NULL, \r
+                STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
+                gShellLevel1HiiHandle, \r
+                ArgSet, \r
+                CurrentScriptFile!=NULL \r
+                  && CurrentScriptFile->CurrentCommand!=NULL\r
+                  ? CurrentScriptFile->CurrentCommand->Line:0);\r
               ShellStatus = SHELL_INVALID_PARAMETER;\r
             } else {\r
               if (ArgSetWalker[0] == L'-') {\r
@@ -479,7 +516,16 @@ ShellCommandRunFor (
               }\r
               if (ArgSetWalker != NULL && *ArgSetWalker != CHAR_NULL) {\r
                 if (ArgSetWalker == NULL || *ArgSetWalker == CHAR_NULL || !ShellIsValidForNumber(ArgSetWalker)){\r
-                  ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), gShellLevel1HiiHandle, ArgSet, ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+                  ShellPrintHiiEx(\r
+                    -1, \r
+                    -1, \r
+                    NULL, \r
+                    STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
+                    gShellLevel1HiiHandle, \r
+                    ArgSet, \r
+                    CurrentScriptFile!=NULL \r
+                      && CurrentScriptFile->CurrentCommand!=NULL\r
+                      ? CurrentScriptFile->CurrentCommand->Line:0);\r
                   ShellStatus = SHELL_INVALID_PARAMETER;\r
                 } else {\r
                   if (*ArgSetWalker == L')') {\r
@@ -492,7 +538,16 @@ ShellCommandRunFor (
                     }\r
 \r
                     if (StrStr(ArgSetWalker, L" ") != NULL) {\r
-                      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), gShellLevel1HiiHandle, ArgSet, ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+                      ShellPrintHiiEx(\r
+                        -1, \r
+                        -1, \r
+                        NULL, \r
+                        STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
+                        gShellLevel1HiiHandle, \r
+                        ArgSet, \r
+                        CurrentScriptFile!=NULL \r
+                          && CurrentScriptFile->CurrentCommand!=NULL\r
+                          ? CurrentScriptFile->CurrentCommand->Line:0);\r
                       ShellStatus = SHELL_INVALID_PARAMETER;\r
                     }\r
                   }\r
@@ -512,7 +567,16 @@ ShellCommandRunFor (
       }\r
       CurrentScriptFile->CurrentCommand->Data = Info;\r
     } else {\r
-      ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), gShellLevel1HiiHandle, ArgSet, ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+      ShellPrintHiiEx(\r
+        -1, \r
+        -1, \r
+        NULL, \r
+        STRING_TOKEN (STR_GEN_PROBLEM_SCRIPT), \r
+        gShellLevel1HiiHandle, \r
+        ArgSet, \r
+        CurrentScriptFile!=NULL \r
+          && CurrentScriptFile->CurrentCommand!=NULL\r
+          ? CurrentScriptFile->CurrentCommand->Line:0);\r
       ShellStatus = SHELL_INVALID_PARAMETER;\r
     }\r
   } else {\r
@@ -553,7 +617,17 @@ ShellCommandRunFor (
         // find the matching endfor (we're done with the loop)\r
         //\r
         if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_NO_MATCHING), gShellLevel1HiiHandle, L"EndFor", L"For", ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+          ShellPrintHiiEx(\r
+            -1, \r
+            -1, \r
+            NULL, \r
+            STRING_TOKEN (STR_SYNTAX_NO_MATCHING), \r
+            gShellLevel1HiiHandle, \r
+            L"EndFor", \r
+            L"For", \r
+            CurrentScriptFile!=NULL \r
+              && CurrentScriptFile->CurrentCommand!=NULL\r
+              ? CurrentScriptFile->CurrentCommand->Line:0);\r
           ShellStatus = SHELL_DEVICE_ERROR;\r
         }\r
         if (Info->RemoveSubstAlias) {\r
@@ -611,7 +685,17 @@ ShellCommandRunFor (
         // find the matching endfor (we're done with the loop)\r
         //\r
         if (!MoveToTag(GetNextNode, L"endfor", L"for", NULL, CurrentScriptFile, TRUE, FALSE, FALSE)) {\r
-          ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SYNTAX_NO_MATCHING), gShellLevel1HiiHandle, L"EndFor", L"For", ShellCommandGetCurrentScriptFile()->CurrentCommand->Line);\r
+          ShellPrintHiiEx(\r
+            -1, \r
+            -1, \r
+            NULL, \r
+            STRING_TOKEN (STR_SYNTAX_NO_MATCHING), \r
+            gShellLevel1HiiHandle, \r
+            L"EndFor", \r
+            L"For", \r
+            CurrentScriptFile!=NULL \r
+              && CurrentScriptFile->CurrentCommand!=NULL\r
+              ? CurrentScriptFile->CurrentCommand->Line:0);\r
           ShellStatus = SHELL_DEVICE_ERROR;\r
         }\r
         if (Info->RemoveSubstAlias) {\r