Sync with other libs

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4031 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
index c13cd462e4ef92c42a6e52d0bade16bae2cb1d07..cbbad2cb5dfb65fe5f30ceb4dc369bd71b646647 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c
@@ -26,6 +26,7 @@
 //\r
 #include "MemLibInternals.h"\r
 \r
+\r
 /**\r
   Copies a source GUID to a destination GUID.\r
 \r
@@ -80,22 +81,17 @@ CompareGuid (
   IN CONST GUID  *Guid2\r
   )\r
 {\r
-  UINT64 Guid1ValueLo;\r
-  UINT64 Guid1ValueHi;\r
-  UINT64 Guid2ValueLo;\r
-  UINT64 Guid2ValueHi;\r
-\r
-  Guid1ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid1);\r
-  Guid2ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid2);\r
-\r
-  Guid1ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid1 + 1);\r
-  Guid2ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid2 + 1);\r
+  UINT64  LowPartOfGuid1;\r
+  UINT64  LowPartOfGuid2;\r
+  UINT64  HighPartOfGuid1;\r
+  UINT64  HighPartOfGuid2;\r
 \r
+  LowPartOfGuid1  = ReadUnaligned64 ((CONST UINT64*) Guid1);\r
+  LowPartOfGuid2  = ReadUnaligned64 ((CONST UINT64*) Guid2);\r
+  HighPartOfGuid1 = ReadUnaligned64 ((CONST UINT64*) Guid1 + 1);\r
+  HighPartOfGuid2 = ReadUnaligned64 ((CONST UINT64*) Guid2 + 1);\r
 \r
-  return (BOOLEAN)\r
-           ((Guid1ValueLo == Guid2ValueLo) &&\r
-            (Guid1ValueHi == Guid2ValueHi)\r
-           );\r
+  return (BOOLEAN) (LowPartOfGuid1 == LowPartOfGuid2 && HighPartOfGuid1 == HighPartOfGuid2);\r
 }\r
 \r
 /**\r