UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / MdeModulePkg / Universal / EbcDxe / EbcDebugger / EdbSupportString.c

diff --git a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c
index 8495af99002e8b4d7a0b329a5098e619fcc40f82..e450e576625f36a51fddb14c6a0ad7f1377d48ad 100644 (file)
--- a/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c
+++ b/MdeModulePkg/Universal/EbcDxe/EbcDebugger/EdbSupportString.c
@@ -1,13 +1,7 @@
 /** @file\r
 \r
 Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials\r
-are licensed and made available under the terms and conditions of the BSD License\r
-which accompanies this distribution.  The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 \r
 **/\r
@@ -33,38 +27,41 @@ Xtoi (
 \r
   ASSERT (Str != NULL);\r
 \r
-  MaxVal = (UINTN) -1 >> 4;\r
+  MaxVal = (UINTN)-1 >> 4;\r
   //\r
   // skip preceeding white space\r
   //\r
   while (*Str != '\0' && *Str == ' ') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // skip preceeding zeros\r
   //\r
   while (*Str != '\0' && *Str == '0') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // skip preceeding white space\r
   //\r
-  if (*Str != '\0' && (*Str == 'x' || *Str == 'X')) {\r
+  if ((*Str != '\0') && ((*Str == 'x') || (*Str == 'X'))) {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // convert hex digits\r
   //\r
-  RetVal = 0;\r
+  RetVal   = 0;\r
   TempChar = *(Str++);\r
   while (TempChar != '\0') {\r
-    if (TempChar >= 'a' && TempChar <= 'f') {\r
+    if ((TempChar >= 'a') && (TempChar <= 'f')) {\r
       TempChar -= 'a' - 'A';\r
     }\r
 \r
-    if ((TempChar >= '0' && TempChar <= '9') || (TempChar >= 'A' && TempChar <= 'F')) {\r
+    if (((TempChar >= '0') && (TempChar <= '9')) || ((TempChar >= 'A') && (TempChar <= 'F'))) {\r
       if (RetVal > MaxVal) {\r
-        return (UINTN) -1;\r
+        return (UINTN)-1;\r
       }\r
 \r
       RetVal = (RetVal << 4) | (TempChar - (TempChar >= 'A' ? 'A' - 10 : '0'));\r
@@ -97,38 +94,41 @@ LXtoi (
 \r
   ASSERT (Str != NULL);\r
 \r
-  MaxVal = RShiftU64 ((UINT64) -1, 4);\r
+  MaxVal = RShiftU64 ((UINT64)-1, 4);\r
   //\r
   // skip preceeding white space\r
   //\r
   while (*Str != '\0' && *Str == ' ') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // skip preceeding zeros\r
   //\r
   while (*Str != '\0' && *Str == '0') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // skip preceeding white space\r
   //\r
-  if (*Str != '\0' && (*Str == 'x' || *Str == 'X')) {\r
+  if ((*Str != '\0') && ((*Str == 'x') || (*Str == 'X'))) {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // convert hex digits\r
   //\r
-  RetVal = 0;\r
+  RetVal   = 0;\r
   TempChar = *(Str++);\r
   while (TempChar != '\0') {\r
-    if (TempChar >= 'a' && TempChar <= 'f') {\r
+    if ((TempChar >= 'a') && (TempChar <= 'f')) {\r
       TempChar -= 'a' - 'A';\r
     }\r
 \r
-    if ((TempChar >= '0' && TempChar <= '9') || (TempChar >= 'A' && TempChar <= 'F')) {\r
+    if (((TempChar >= '0') && (TempChar <= '9')) || ((TempChar >= 'A') && (TempChar <= 'F'))) {\r
       if (RetVal > MaxVal) {\r
-        return (UINT64) -1;\r
+        return (UINT64)-1;\r
       }\r
 \r
       RetVal = LShiftU64 (RetVal, 4);\r
@@ -163,23 +163,24 @@ Atoi (
 \r
   ASSERT (Str != NULL);\r
 \r
-  MaxVal = (UINTN) -1 / 10;\r
-  ResteVal = (UINTN) -1 % 10;\r
+  MaxVal   = (UINTN)-1 / 10;\r
+  ResteVal = (UINTN)-1 % 10;\r
   //\r
   // skip preceeding white space\r
   //\r
   while (*Str != '\0' && *Str == ' ') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // convert digits\r
   //\r
-  RetVal = 0;\r
+  RetVal   = 0;\r
   TempChar = *(Str++);\r
   while (TempChar != '\0') {\r
-    if (TempChar >= '0' && TempChar <= '9') {\r
-      if (RetVal > MaxVal || (RetVal == MaxVal && TempChar - '0' > (INTN) ResteVal)) {\r
-        return (UINTN) -1;\r
+    if ((TempChar >= '0') && (TempChar <= '9')) {\r
+      if ((RetVal > MaxVal) || ((RetVal == MaxVal) && (TempChar - '0' > (INTN)ResteVal))) {\r
+        return (UINTN)-1;\r
       }\r
 \r
       RetVal = (RetVal * 10) + TempChar - '0';\r
@@ -206,44 +207,47 @@ AsciiXtoi (
   CHAR8  *Str\r
   )\r
 {\r
-  UINTN   RetVal;\r
-  CHAR8   TempChar;\r
-  UINTN   MaxVal;\r
+  UINTN  RetVal;\r
+  CHAR8  TempChar;\r
+  UINTN  MaxVal;\r
 \r
   ASSERT (Str != NULL);\r
 \r
-  MaxVal = (UINTN) -1 >> 4;\r
+  MaxVal = (UINTN)-1 >> 4;\r
   //\r
   // skip preceeding white space\r
   //\r
   while (*Str != '\0' && *Str == ' ') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // skip preceeding zeros\r
   //\r
   while (*Str != '\0' && *Str == '0') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // skip preceeding white space\r
   //\r
-  if (*Str != '\0' && (*Str == 'x' || *Str == 'X')) {\r
+  if ((*Str != '\0') && ((*Str == 'x') || (*Str == 'X'))) {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // convert hex digits\r
   //\r
-  RetVal = 0;\r
+  RetVal   = 0;\r
   TempChar = *(Str++);\r
   while (TempChar != '\0') {\r
-    if (TempChar >= 'a' && TempChar <= 'f') {\r
+    if ((TempChar >= 'a') && (TempChar <= 'f')) {\r
       TempChar -= 'a' - 'A';\r
     }\r
 \r
-    if ((TempChar >= '0' && TempChar <= '9') || (TempChar >= 'A' && TempChar <= 'F')) {\r
+    if (((TempChar >= '0') && (TempChar <= '9')) || ((TempChar >= 'A') && (TempChar <= 'F'))) {\r
       if (RetVal > MaxVal) {\r
-        return (UINTN) -1;\r
+        return (UINTN)-1;\r
       }\r
 \r
       RetVal = (RetVal << 4) | (TempChar - (TempChar >= 'A' ? 'A' - 10 : '0'));\r
@@ -270,30 +274,31 @@ AsciiAtoi (
   CHAR8  *Str\r
   )\r
 {\r
-  UINTN   RetVal;\r
-  CHAR8   TempChar;\r
-  UINTN   MaxVal;\r
-  UINTN   ResteVal;\r
+  UINTN  RetVal;\r
+  CHAR8  TempChar;\r
+  UINTN  MaxVal;\r
+  UINTN  ResteVal;\r
 \r
   ASSERT (Str != NULL);\r
 \r
-  MaxVal = (UINTN) -1 / 10;\r
-  ResteVal = (UINTN) -1 % 10;\r
+  MaxVal   = (UINTN)-1 / 10;\r
+  ResteVal = (UINTN)-1 % 10;\r
   //\r
   // skip preceeding white space\r
   //\r
   while (*Str != '\0' && *Str == ' ') {\r
     Str += 1;\r
   }\r
+\r
   //\r
   // convert digits\r
   //\r
-  RetVal = 0;\r
+  RetVal   = 0;\r
   TempChar = *(Str++);\r
   while (TempChar != '\0') {\r
-    if (TempChar >= '0' && TempChar <= '9') {\r
-      if (RetVal > MaxVal || (RetVal == MaxVal && TempChar - '0' > (INTN) ResteVal)) {\r
-        return (UINTN) -1;\r
+    if ((TempChar >= '0') && (TempChar <= '9')) {\r
+      if ((RetVal > MaxVal) || ((RetVal == MaxVal) && (TempChar - '0' > (INTN)ResteVal))) {\r
+        return (UINTN)-1;\r
       }\r
 \r
       RetVal = (RetVal * 10) + TempChar - '0';\r
@@ -307,38 +312,6 @@ AsciiAtoi (
   return RetVal;\r
 }\r
 \r
-/**\r
-\r
-  Convert the character to upper case.\r
-\r
-  @param  Chr    the character to be converted.\r
-\r
-**/\r
-STATIC\r
-CHAR16\r
-InternalUnicodeToUpper (\r
-  IN      CHAR16                    Chr\r
-  )\r
-{\r
-  return (Chr >= L'a' && Chr <= L'z') ? Chr - (L'a' - L'A') : Chr;\r
-}\r
-\r
-/**\r
-\r
-  Convert the character to upper case.\r
-\r
-  @param  Chr    the character to be converted.\r
-\r
-**/\r
-STATIC\r
-CHAR8\r
-InternalAsciiToUpper (\r
-  IN      CHAR8                     Chr\r
-  )\r
-{\r
-  return (Chr >= 'a' && Chr <= 'z') ? Chr - ('a' - 'A') : Chr;\r
-}\r
-\r
 /**\r
   Compare the Unicode and Ascii string pointed by String to the string pointed by String2.\r
 \r
@@ -354,8 +327,8 @@ InternalAsciiToUpper (
 INTN\r
 EFIAPI\r
 StrCmpUnicodeAndAscii (\r
-  IN CHAR16   *String,\r
-  IN CHAR8    *String2\r
+  IN CHAR16  *String,\r
+  IN CHAR8   *String2\r
   )\r
 {\r
   while (*String != '\0') {\r
@@ -363,7 +336,7 @@ StrCmpUnicodeAndAscii (
       break;\r
     }\r
 \r
-    String += 1;\r
+    String  += 1;\r
     String2 += 1;\r
   }\r
 \r
@@ -385,17 +358,18 @@ StrCmpUnicodeAndAscii (
 INTN\r
 EFIAPI\r
 StriCmp (\r
-  IN CHAR16   *String,\r
-  IN CHAR16   *String2\r
+  IN CHAR16  *String,\r
+  IN CHAR16  *String2\r
   )\r
 {\r
   while ((*String != L'\0') &&\r
-         (InternalUnicodeToUpper (*String) == InternalUnicodeToUpper (*String2))) {\r
+         (CharToUpper (*String) == CharToUpper (*String2)))\r
+  {\r
     String++;\r
     String2++;\r
   }\r
 \r
-  return InternalUnicodeToUpper (*String) - InternalUnicodeToUpper (*String2);\r
+  return CharToUpper (*String) - CharToUpper (*String2);\r
 }\r
 \r
 /**\r
@@ -413,17 +387,18 @@ StriCmp (
 INTN\r
 EFIAPI\r
 StriCmpUnicodeAndAscii (\r
-  IN CHAR16   *String,\r
-  IN CHAR8    *String2\r
+  IN CHAR16  *String,\r
+  IN CHAR8   *String2\r
   )\r
 {\r
   while ((*String != L'\0') &&\r
-         (InternalUnicodeToUpper (*String) == (CHAR16)InternalAsciiToUpper (*String2))) {\r
+         (CharToUpper (*String) == (CHAR16)AsciiCharToUpper (*String2)))\r
+  {\r
     String++;\r
     String2++;\r
   }\r
 \r
-  return InternalUnicodeToUpper (*String) - (CHAR16)InternalAsciiToUpper (*String2);\r
+  return CharToUpper (*String) - (CHAR16)AsciiCharToUpper (*String2);\r
 }\r
 \r
 /**\r
@@ -437,17 +412,17 @@ StriCmpUnicodeAndAscii (
 BOOLEAN\r
 EFIAPI\r
 StrEndWith (\r
-  IN CHAR16                       *Str,\r
-  IN CHAR16                       *SubStr\r
+  IN CHAR16  *Str,\r
+  IN CHAR16  *SubStr\r
   )\r
 {\r
   CHAR16  *Temp;\r
 \r
-  if ((Str == NULL) || (SubStr == NULL) || (StrLen(Str) < StrLen(SubStr))) {\r
+  if ((Str == NULL) || (SubStr == NULL) || (StrLen (Str) < StrLen (SubStr))) {\r
     return FALSE;\r
   }\r
 \r
-  Temp = Str + StrLen(Str) - StrLen(SubStr);\r
+  Temp = Str + StrLen (Str) - StrLen (SubStr);\r
 \r
   //\r
   // Compare\r
@@ -468,23 +443,23 @@ StrEndWith (
 CHAR16 *\r
 EFIAPI\r
 StrDuplicate (\r
-  IN CHAR16   *Src\r
+  IN CHAR16  *Src\r
   )\r
 {\r
-  CHAR16      *Dest;\r
-  UINTN       Size;\r
+  CHAR16  *Dest;\r
+  UINTN   Size;\r
 \r
-  Size = (StrLen(Src) + 1) * sizeof(CHAR16);\r
+  Size = (StrLen (Src) + 1) * sizeof (CHAR16);\r
   Dest = AllocateZeroPool (Size);\r
   if (Dest != NULL) {\r
     CopyMem (Dest, Src, Size);\r
   }\r
+\r
   return Dest;\r
 }\r
 \r
-\r
-CHAR16  *mLineBuffer          = NULL;\r
-CHAR16  *mFieldBuffer         = NULL;\r
+CHAR16  *mLineBuffer  = NULL;\r
+CHAR16  *mFieldBuffer = NULL;\r
 \r
 /**\r
 \r
@@ -497,8 +472,8 @@ CHAR16  *mFieldBuffer         = NULL;
 UINTN\r
 EFIAPI\r
 StrSpn (\r
-  IN CHAR16                       *String,\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *String,\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   UINTN   Count;\r
@@ -507,8 +482,8 @@ StrSpn (
 \r
   Count = 0;\r
 \r
-  for (Str1 = String; *Str1 != L'\0'; Str1 ++) {\r
-    for (Str2 = CharSet; *Str2 != L'\0'; Str2 ++) {\r
+  for (Str1 = String; *Str1 != L'\0'; Str1++) {\r
+    for (Str2 = CharSet; *Str2 != L'\0'; Str2++) {\r
       if (*Str1 == *Str2) {\r
         break;\r
       }\r
@@ -518,7 +493,7 @@ StrSpn (
       return Count;\r
     }\r
 \r
-    Count ++;\r
+    Count++;\r
   }\r
 \r
   return Count;\r
@@ -536,17 +511,17 @@ StrSpn (
 CHAR16 *\r
 EFIAPI\r
 StrBrk (\r
-  IN CHAR16                       *String,\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *String,\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   CHAR16  *Str1;\r
   CHAR16  *Str2;\r
 \r
-  for (Str1 = String; *Str1 != L'\0'; Str1 ++) {\r
-    for (Str2 = CharSet; *Str2 != L'\0'; Str2 ++) {\r
+  for (Str1 = String; *Str1 != L'\0'; Str1++) {\r
+    for (Str2 = CharSet; *Str2 != L'\0'; Str2++) {\r
       if (*Str1 == *Str2) {\r
-        return (CHAR16 *) Str1;\r
+        return (CHAR16 *)Str1;\r
       }\r
     }\r
   }\r
@@ -565,8 +540,8 @@ StrBrk (
 CHAR16 *\r
 EFIAPI\r
 StrTokenLine (\r
-  IN CHAR16                       *String OPTIONAL,\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *String OPTIONAL,\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   CHAR16  *Begin;\r
@@ -586,7 +561,7 @@ StrTokenLine (
   End = StrBrk (Begin, CharSet);\r
   if ((End != NULL) && (*End != L'\0')) {\r
     *End = L'\0';\r
-    End ++;\r
+    End++;\r
   }\r
 \r
   mLineBuffer = End;\r
@@ -604,14 +579,13 @@ StrTokenLine (
 CHAR16 *\r
 EFIAPI\r
 StrTokenField (\r
-  IN CHAR16                       *String OPTIONAL,\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *String OPTIONAL,\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   CHAR16  *Begin;\r
   CHAR16  *End;\r
 \r
-\r
   Begin = (String == NULL) ? mFieldBuffer : String;\r
   if (Begin == NULL) {\r
     return NULL;\r
@@ -625,7 +599,7 @@ StrTokenField (
   End = StrBrk (Begin, CharSet);\r
   if ((End != NULL) && (*End != L'\0')) {\r
     *End = L'\0';\r
-    End ++;\r
+    End++;\r
   }\r
 \r
   mFieldBuffer = End;\r
@@ -643,8 +617,8 @@ StrTokenField (
 CHAR16 *\r
 EFIAPI\r
 StrGetNewTokenLine (\r
-  IN CHAR16                       *String,\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *String,\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   return StrTokenLine (String, CharSet);\r
@@ -660,7 +634,7 @@ StrGetNewTokenLine (
 CHAR16 *\r
 EFIAPI\r
 StrGetNextTokenLine (\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   return StrTokenLine (NULL, CharSet);\r
@@ -677,8 +651,8 @@ StrGetNextTokenLine (
 CHAR16 *\r
 EFIAPI\r
 StrGetNewTokenField (\r
-  IN CHAR16                       *String,\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *String,\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   return StrTokenField (String, CharSet);\r
@@ -694,7 +668,7 @@ StrGetNewTokenField (
 CHAR16 *\r
 EFIAPI\r
 StrGetNextTokenField (\r
-  IN CHAR16                       *CharSet\r
+  IN CHAR16  *CharSet\r
   )\r
 {\r
   return StrTokenField (NULL, CharSet);\r
@@ -711,23 +685,24 @@ StrGetNextTokenField (
 VOID\r
 EFIAPI\r
 PatchForStrTokenAfter (\r
-  IN CHAR16    *Buffer,\r
-  IN CHAR16    Patch\r
+  IN CHAR16  *Buffer,\r
+  IN CHAR16  Patch\r
   )\r
 {\r
-  CHAR16 *Str;\r
+  CHAR16  *Str;\r
 \r
   if (Buffer == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Str = Buffer;\r
   while (*Str != 0) {\r
-    Str ++;\r
+    Str++;\r
   }\r
+\r
   *Str = Patch;\r
 \r
-  while (*(Str ++) != '\0') {\r
+  while (*(Str++) != '\0') {\r
     if (*Str == 0) {\r
       *Str = Patch;\r
     } else {\r
@@ -735,7 +710,7 @@ PatchForStrTokenAfter (
     }\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -748,18 +723,18 @@ PatchForStrTokenAfter (
 VOID\r
 EFIAPI\r
 PatchForStrTokenBefore (\r
-  IN CHAR16    *Buffer,\r
-  IN CHAR16    Patch\r
+  IN CHAR16  *Buffer,\r
+  IN CHAR16  Patch\r
   )\r
 {\r
-  CHAR16 *Str;\r
+  CHAR16  *Str;\r
 \r
   if (Buffer == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Str = Buffer;\r
-  while (*(Str --) != '\0') {\r
+  while (*(Str--) != '\0') {\r
     if ((*Str == 0) || (*Str == Patch)) {\r
       *Str = Patch;\r
     } else {\r
@@ -767,11 +742,11 @@ PatchForStrTokenBefore (
     }\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
-CHAR8  *mAsciiLineBuffer          = NULL;\r
-CHAR8  *mAsciiFieldBuffer         = NULL;\r
+CHAR8  *mAsciiLineBuffer  = NULL;\r
+CHAR8  *mAsciiFieldBuffer = NULL;\r
 \r
 /**\r
 \r
@@ -784,18 +759,18 @@ CHAR8  *mAsciiFieldBuffer         = NULL;
 UINTN\r
 EFIAPI\r
 AsciiStrSpn (\r
-  IN CHAR8                       *String,\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *String,\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
-  UINTN   Count;\r
+  UINTN  Count;\r
   CHAR8  *Str1;\r
   CHAR8  *Str2;\r
 \r
   Count = 0;\r
 \r
-  for (Str1 = String; *Str1 != '\0'; Str1 ++) {\r
-    for (Str2 = CharSet; *Str2 != '\0'; Str2 ++) {\r
+  for (Str1 = String; *Str1 != '\0'; Str1++) {\r
+    for (Str2 = CharSet; *Str2 != '\0'; Str2++) {\r
       if (*Str1 == *Str2) {\r
         break;\r
       }\r
@@ -805,7 +780,7 @@ AsciiStrSpn (
       return Count;\r
     }\r
 \r
-    Count ++;\r
+    Count++;\r
   }\r
 \r
   return Count;\r
@@ -822,17 +797,17 @@ AsciiStrSpn (
 CHAR8 *\r
 EFIAPI\r
 AsciiStrBrk (\r
-  IN CHAR8                       *String,\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *String,\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
   CHAR8  *Str1;\r
   CHAR8  *Str2;\r
 \r
-  for (Str1 = String; *Str1 != '\0'; Str1 ++) {\r
-    for (Str2 = CharSet; *Str2 != '\0'; Str2 ++) {\r
+  for (Str1 = String; *Str1 != '\0'; Str1++) {\r
+    for (Str2 = CharSet; *Str2 != '\0'; Str2++) {\r
       if (*Str1 == *Str2) {\r
-        return (CHAR8 *) Str1;\r
+        return (CHAR8 *)Str1;\r
       }\r
     }\r
   }\r
@@ -851,8 +826,8 @@ AsciiStrBrk (
 CHAR8 *\r
 EFIAPI\r
 AsciiStrTokenLine (\r
-  IN CHAR8                       *String OPTIONAL,\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *String OPTIONAL,\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
   CHAR8  *Begin;\r
@@ -872,7 +847,7 @@ AsciiStrTokenLine (
   End = AsciiStrBrk (Begin, CharSet);\r
   if ((End != NULL) && (*End != '\0')) {\r
     *End = '\0';\r
-    End ++;\r
+    End++;\r
   }\r
 \r
   mAsciiLineBuffer = End;\r
@@ -890,14 +865,13 @@ AsciiStrTokenLine (
 CHAR8 *\r
 EFIAPI\r
 AsciiStrTokenField (\r
-  IN CHAR8                       *String OPTIONAL,\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *String OPTIONAL,\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
   CHAR8  *Begin;\r
   CHAR8  *End;\r
 \r
-\r
   Begin = (String == NULL) ? mAsciiFieldBuffer : String;\r
   if (Begin == NULL) {\r
     return NULL;\r
@@ -911,7 +885,7 @@ AsciiStrTokenField (
   End = AsciiStrBrk (Begin, CharSet);\r
   if ((End != NULL) && (*End != '\0')) {\r
     *End = '\0';\r
-    End ++;\r
+    End++;\r
   }\r
 \r
   mAsciiFieldBuffer = End;\r
@@ -929,8 +903,8 @@ AsciiStrTokenField (
 CHAR8 *\r
 EFIAPI\r
 AsciiStrGetNewTokenLine (\r
-  IN CHAR8                       *String,\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *String,\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
   return AsciiStrTokenLine (String, CharSet);\r
@@ -946,7 +920,7 @@ AsciiStrGetNewTokenLine (
 CHAR8 *\r
 EFIAPI\r
 AsciiStrGetNextTokenLine (\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
   return AsciiStrTokenLine (NULL, CharSet);\r
@@ -963,8 +937,8 @@ AsciiStrGetNextTokenLine (
 CHAR8 *\r
 EFIAPI\r
 AsciiStrGetNewTokenField (\r
-  IN CHAR8                       *String,\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *String,\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
   return AsciiStrTokenField (String, CharSet);\r
@@ -980,7 +954,7 @@ AsciiStrGetNewTokenField (
 CHAR8 *\r
 EFIAPI\r
 AsciiStrGetNextTokenField (\r
-  IN CHAR8                       *CharSet\r
+  IN CHAR8  *CharSet\r
   )\r
 {\r
   return AsciiStrTokenField (NULL, CharSet);\r
@@ -997,23 +971,24 @@ AsciiStrGetNextTokenField (
 VOID\r
 EFIAPI\r
 PatchForAsciiStrTokenAfter (\r
-  IN CHAR8    *Buffer,\r
-  IN CHAR8    Patch\r
+  IN CHAR8  *Buffer,\r
+  IN CHAR8  Patch\r
   )\r
 {\r
-  CHAR8 *Str;\r
+  CHAR8  *Str;\r
 \r
   if (Buffer == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Str = Buffer;\r
   while (*Str != 0) {\r
-    Str ++;\r
+    Str++;\r
   }\r
+\r
   *Str = Patch;\r
 \r
-  while (*(Str ++) != '\0') {\r
+  while (*(Str++) != '\0') {\r
     if (*Str == 0) {\r
       *Str = Patch;\r
     } else {\r
@@ -1021,7 +996,7 @@ PatchForAsciiStrTokenAfter (
     }\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r
 \r
 /**\r
@@ -1034,18 +1009,18 @@ PatchForAsciiStrTokenAfter (
 VOID\r
 EFIAPI\r
 PatchForAsciiStrTokenBefore (\r
-  IN CHAR8    *Buffer,\r
-  IN CHAR8    Patch\r
+  IN CHAR8  *Buffer,\r
+  IN CHAR8  Patch\r
   )\r
 {\r
-  CHAR8 *Str;\r
+  CHAR8  *Str;\r
 \r
   if (Buffer == NULL) {\r
-    return ;\r
+    return;\r
   }\r
 \r
   Str = Buffer;\r
-  while (*(Str --) != '\0') {\r
+  while (*(Str--) != '\0') {\r
     if ((*Str == 0) || (*Str == Patch)) {\r
       *Str = Patch;\r
     } else {\r
@@ -1053,5 +1028,5 @@ PatchForAsciiStrTokenBefore (
     }\r
   }\r
 \r
-  return ;\r
+  return;\r
 }\r