ShellPkg: Revert 16720 and 16734.

I will submit a new patch.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jaben Carsey <Jaben.carsey@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16758 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index 52b6834ab99ac176829afa8fc0021122aff1c22d..dcf48d3223e81ab258f1db8966a82ab02587583b 100644 (file)
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -211,21 +211,20 @@ ContainsSplit(
   SecondQuote   = NULL;\r
   TempSpot      = FindFirstCharacter(CmdLine, L"|", L'^');\r
 \r
-  if (FirstQuote == NULL        || \r
-      *FirstQuote == CHAR_NULL  ||\r
-      TempSpot == NULL          || \r
-      *TempSpot == CHAR_NULL    || \r
+  if (FirstQuote == NULL    || \r
+      TempSpot == NULL      || \r
+      TempSpot == CHAR_NULL || \r
       FirstQuote > TempSpot\r
       ) {\r
     return (BOOLEAN) ((TempSpot != NULL) && (*TempSpot != CHAR_NULL));\r
   }\r
 \r
   while ((TempSpot != NULL) && (*TempSpot != CHAR_NULL)) {\r
-    if (FirstQuote == NULL || *FirstQuote == CHAR_NULL || FirstQuote > TempSpot) {\r
+    if (FirstQuote == NULL || FirstQuote > TempSpot) {\r
       break;\r
     }    \r
     SecondQuote = FindNextInstance (FirstQuote + 1, L"\"", TRUE);\r
-    if (SecondQuote == NULL || *SecondQuote == CHAR_NULL) {\r
+    if (SecondQuote == NULL) {\r
       break;\r
     }\r
     if (SecondQuote < TempSpot) {\r
@@ -1375,7 +1374,7 @@ StripUnreplacedEnvironmentVariables(
       continue;\r
     }\r
     \r
-    if (FirstQuote == NULL || *FirstQuote == CHAR_NULL || SecondPercent < FirstQuote) {\r
+    if (FirstQuote == NULL || SecondPercent < FirstQuote) {\r
       if (IsValidEnvironmentVariableName(FirstPercent, SecondPercent)) {\r
         //\r
         // We need to remove from FirstPercent to SecondPercent\r