Fix various warnings with the Intel C compiler.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EfiCommonLib / String.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
index 150f650598edab41c3c4cb4314b5a26071d84b6f..54523b241729289fbe42bcd2e2d69eca6283997c 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EfiCommonLib/String.c
@@ -593,7 +593,7 @@ HexStringToBuf (
     } else {\r
       Byte = Buf[Idx / 2];\r
       Byte &= 0x0F;\r
-      Byte |= Digit << 4;\r
+      Byte = (UINT8)(Byte | (Digit << 4));\r
     }\r
 \r
     Buf[Idx / 2] = Byte;\r
@@ -749,9 +749,11 @@ Returns:
   Sub = StrCharSet;\r
   \r
   while ((*String != L'\0') && (*StrCharSet != L'\0')) {\r
-    if (*String++ != *StrCharSet++) {\r
+    if (*String++ != *StrCharSet) {\r
       String = ++Src;\r
       StrCharSet = Sub;\r
+    } else {\r
+      StrCharSet++;\r
     }\r
   }\r
   if (*StrCharSet == L'\0') {\r
@@ -788,9 +790,11 @@ Returns:
   Sub = StrCharSet;\r
   \r
   while ((*String != '\0') && (*StrCharSet != '\0')) {\r
-    if (*String++ != *StrCharSet++) {\r
+    if (*String++ != *StrCharSet) {\r
       String = ++Src;\r
       StrCharSet = Sub;\r
+    } else {\r
+      StrCharSet++;\r
     }\r
   }\r
   if (*StrCharSet == '\0') {\r