1. fix the wrong description, change "target the buffer" to "the target buffer"

2. fix ICC/GYGGCC build failure on ScanMemN() in X64 arch, it can not reach the last sentence when UINTN is equal to UINT64.

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

MdePkg/Library/BaseMemoryLib/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/BaseMemoryLib/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLib/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLib/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLib/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/BaseMemoryLib/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }

MdePkg/Library/BaseMemoryLibMmx/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/BaseMemoryLibMmx/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibMmx/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibMmx/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/BaseMemoryLibMmx/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }

MdePkg/Library/BaseMemoryLibOptDxe/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptDxe/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptDxe/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptDxe/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptDxe/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/BaseMemoryLibOptDxe/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }

MdePkg/Library/BaseMemoryLibOptPei/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptPei/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptPei/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptPei/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibOptPei/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/BaseMemoryLibOptPei/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }

MdePkg/Library/BaseMemoryLibRepStr/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/BaseMemoryLibRepStr/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibRepStr/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibRepStr/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibRepStr/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/BaseMemoryLibRepStr/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }

MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibSse2/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibSse2/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/BaseMemoryLibSse2/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/BaseMemoryLibSse2/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }

MdePkg/Library/PeiMemoryLib/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/PeiMemoryLib/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/PeiMemoryLib/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/PeiMemoryLib/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/PeiMemoryLib/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/PeiMemoryLib/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }

MdePkg/Library/UefiMemoryLib/MemLibGuid.c

@@ -98,7 +98,7 @@ CompareGuid (
   Scans a target buffer for a GUID, and returns a pointer to the matching GUID
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from
+  This function searches the target buffer specified by Buffer and Length from
   the lowest address to the highest address at 128-bit increments for the 128-bit
   GUID value that matches Guid.  If a match is found, then a pointer to the matching
   GUID in the target buffer is returned.  If no match is found, then NULL is returned.

MdePkg/Library/UefiMemoryLib/ScanMem16Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 16-bit value, and returns a pointer to the matching 16-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 16-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/UefiMemoryLib/ScanMem32Wrapper.c

@@ -28,7 +28,7 @@
   Scans a target buffer for a 32-bit value, and returns a pointer to the matching 32-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 32-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/UefiMemoryLib/ScanMem64Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for a 64-bit value, and returns a pointer to the matching 64-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a 64-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.

MdePkg/Library/UefiMemoryLib/ScanMem8Wrapper.c

@@ -29,7 +29,7 @@
   Scans a target buffer for an 8-bit value, and returns a pointer to the matching 8-bit value
   in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for an 8-bit value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -65,7 +65,7 @@ ScanMem8 (
   Scans a target buffer for a UINTN sized value, and returns a pointer to the matching 
   UINTN sized value in the target buffer.
 
-  This function searches target the buffer specified by Buffer and Length from the lowest
+  This function searches the target buffer specified by Buffer and Length from the lowest
   address to the highest address for a UINTN sized value that matches Value.  If a match is found,
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,
   then NULL is returned.  If Length is 0, then NULL is returned.
@@ -92,7 +92,8 @@ ScanMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return ScanMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return ScanMem32 (Buffer, Length, (UINT32)Value);
   }
-  return ScanMem32 (Buffer, Length, (UINT32)Value);
 }
 

MdePkg/Library/UefiMemoryLib/SetMemWrapper.c

@@ -85,6 +85,7 @@ SetMemN (
 {
   if (sizeof (UINTN) == sizeof (UINT64)) {
     return SetMem64 (Buffer, Length, (UINT64)Value);
+  } else {
+    return SetMem32 (Buffer, Length, (UINT32)Value);
   }
-  return SetMem32 (Buffer, Length, (UINT32)Value);
 }