From a326286cb1b3b80e31e1c21cf9a60200d9bb77df Mon Sep 17 00:00:00 2001 From: mdkinney Date: Sat, 6 Oct 2007 21:52:22 +0000 Subject: Sync with other libs git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4031 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c') diff --git a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c index c13cd462e4..cbbad2cb5d 100644 --- a/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c +++ b/MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c @@ -26,6 +26,7 @@ // #include "MemLibInternals.h" + /** Copies a source GUID to a destination GUID. @@ -80,22 +81,17 @@ CompareGuid ( IN CONST GUID *Guid2 ) { - UINT64 Guid1ValueLo; - UINT64 Guid1ValueHi; - UINT64 Guid2ValueLo; - UINT64 Guid2ValueHi; - - Guid1ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid1); - Guid2ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid2); - - Guid1ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid1 + 1); - Guid2ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid2 + 1); + UINT64 LowPartOfGuid1; + UINT64 LowPartOfGuid2; + UINT64 HighPartOfGuid1; + UINT64 HighPartOfGuid2; + LowPartOfGuid1 = ReadUnaligned64 ((CONST UINT64*) Guid1); + LowPartOfGuid2 = ReadUnaligned64 ((CONST UINT64*) Guid2); + HighPartOfGuid1 = ReadUnaligned64 ((CONST UINT64*) Guid1 + 1); + HighPartOfGuid2 = ReadUnaligned64 ((CONST UINT64*) Guid2 + 1); - return (BOOLEAN) - ((Guid1ValueLo == Guid2ValueLo) && - (Guid1ValueHi == Guid2ValueHi) - ); + return (BOOLEAN) (LowPartOfGuid1 == LowPartOfGuid2 && HighPartOfGuid1 == HighPartOfGuid2); } /** -- cgit v1.2.3