X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseMemoryLibSse2%2FScanMem16Wrapper.c;h=3eb0cbb2133e247a4431ec9105ce98a306fdb83c;hb=9095d37b8fe5bfc3d02adad6ba7fd7359ebc0107;hp=9ffc2cf159e758b64671a3ef7d4a245f110bda49;hpb=24e25d11c0460dfb39fade685375c0e58cbcb40e;p=mirror_edk2.git

diff --git a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
index 9ffc2cf159..3eb0cbb213 100644
--- a/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/ScanMem16Wrapper.c
@@ -1,26 +1,26 @@
 /** @file
   ScanMem16() implementation.
 
-  Copyright (c) 2006, Intel Corporation<BR>
-  All rights reserved. This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-  Module Name:  ScanMem16Wrapper.c
-
-  The following BaseMemoryLib instances share the same version of this file:
+  The following BaseMemoryLib instances contain the same copy of this file:
 
     BaseMemoryLib
     BaseMemoryLibMmx
     BaseMemoryLibSse2
     BaseMemoryLibRepStr
+    BaseMemoryLibOptDxe
+    BaseMemoryLibOptPei
     PeiMemoryLib
     UefiMemoryLib
 
+  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+  This program and the accompanying materials
+  are licensed and made available under the terms and conditions of the BSD License
+  which accompanies this distribution.  The full text of the license may be found at
+  http://opensource.org/licenses/bsd-license.php.
+
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
 **/
 
 #include "MemLibInternals.h"
@@ -29,17 +29,19 @@
   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.
+
   If Length > 0 and Buffer is NULL, then ASSERT().
   If Buffer is not aligned on a 16-bit boundary, then ASSERT().
-  If Length is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 
+  If Length is not aligned on a 16-bit boundary, then ASSERT().
+  If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().
 
-  @param  Buffer      Pointer to the target buffer to scan.
-  @param  Length      Number of bytes in Buffer to scan.
-  @param  Value       Value to search for in the target buffer.
+  @param  Buffer      The pointer to the target buffer to scan.
+  @param  Length      The number of bytes in Buffer to scan.
+  @param  Value       The value to search for in the target buffer.
 
   @return A pointer to the matching byte in the target buffer or NULL otherwise.
 
@@ -52,16 +54,14 @@ ScanMem16 (
   IN UINT16      Value
   )
 {
-  UINTN     Stride;
-  
-  Stride = Length / sizeof (Value);
-  if (Stride == 0) {
+  if (Length == 0) {
     return NULL;
   }
 
   ASSERT (Buffer != NULL);
   ASSERT (((UINTN)Buffer & (sizeof (Value) - 1)) == 0);
   ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);
 
-  return (VOID*)InternalMemScanMem16 (Buffer, Stride, Value);
+  return (VOID*)InternalMemScanMem16 (Buffer, Length / sizeof (Value), Value);
 }