Make MDE package pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / MdePkg / Library / BaseLib / Ipf / Unaligned.c

diff --git a/MdePkg/Library/BaseLib/Ipf/Unaligned.c b/MdePkg/Library/BaseLib/Ipf/Unaligned.c
index 30e5b15c5f41c0c6b5cbee4aeeb8456cc784aacc..fc634044b9252ff6dceda744172bb6bdb9211b19 100644 (file)
--- a/MdePkg/Library/BaseLib/Ipf/Unaligned.c
+++ b/MdePkg/Library/BaseLib/Ipf/Unaligned.c
@@ -143,12 +143,15 @@ ReadUnaligned32 (
   IN      CONST UINT32              *Buffer\r
   )\r
 {\r
+  UINT16  LowerBytes;\r
+  UINT16  HigherBytes;\r
+\r
   ASSERT (Buffer != NULL);\r
 \r
-  return (UINT32)(\r
-           ReadUnaligned16 ((UINT16*)Buffer) |\r
-           (ReadUnaligned16 ((UINT16*)Buffer + 1) << 16)\r
-           );\r
+  LowerBytes  = ReadUnaligned16 ((UINT16*) Buffer);\r
+  HigherBytes = ReadUnaligned16 ((UINT16*) Buffer + 1);\r
+\r
+  return (UINT32) (LowerBytes | (HigherBytes << 16));\r
 }\r
 \r
 /**\r
@@ -199,12 +202,15 @@ ReadUnaligned64 (
   IN      CONST UINT64              *Buffer\r
   )\r
 {\r
+  UINT32  LowerBytes;\r
+  UINT32  HigherBytes;\r
+\r
   ASSERT (Buffer != NULL);\r
 \r
-  return (UINT64)(\r
-           ReadUnaligned32 ((UINT32*)Buffer) |\r
-           LShiftU64 (ReadUnaligned32 ((UINT32*)Buffer + 1), 32)\r
-           );\r
+  LowerBytes  = ReadUnaligned32 ((UINT32*) Buffer);\r
+  HigherBytes = ReadUnaligned32 ((UINT32*) Buffer + 1);\r
+\r
+  return (UINT64) (LowerBytes | LShiftU64 (HigherBytes, 32));\r
 }\r
 \r
 /**\r