X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FLibrary%2FBaseMemoryLibMmx%2FScanMem8Wrapper.c;h=2add7849cd6240bf778257d692a8903fca4825c5;hb=1fef058f4b8fefc455bb171e4908c3e835b1b492;hp=9b817b1b0e96920b9d8092b4b610ed38d0b9c42d;hpb=24de7645e857287d096b058f7a64fb7f618c0194;p=mirror_edk2.git

diff --git a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c b/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
index 9b817b1b0e..2add7849cd 100644
--- a/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLibMmx/ScanMem8Wrapper.c
@@ -1,64 +1,62 @@
 /** @file
   ScanMem8() 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:  ScanMem8Wrapper.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 - 2009, 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.
+
 **/
 
 #include "MemLibInternals.h"
 
 /**
-  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 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.
-
-  If Buffer is NULL, then ASSERT().
+  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
+  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.
+  
+  If Length > 0 and Buffer is NULL, 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      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.
 
-  @return Pointer to the first occurrence or NULL if not found.
-  @retval NULL  if Length == 0 or Value was not found.
+  @return A pointer to the matching byte in the target buffer or NULL otherwise.
 
 **/
 VOID *
 EFIAPI
 ScanMem8 (
-  IN      CONST VOID                *Buffer,
-  IN      UINTN                     Length,
-  IN      UINT8                     Value
+  IN CONST VOID  *Buffer,
+  IN UINTN       Length,
+  IN UINT8       Value
   )
 {
-  ASSERT (Buffer != NULL);
-  ASSERT (Length <= MAX_ADDRESS + (UINTN)Buffer + 1);
-
-  if ((Length /= sizeof (Value)) == 0) {
+  if (Length == 0) {
     return NULL;
   }
+  ASSERT (Buffer != NULL);
+  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));
+ 
   return (VOID*)InternalMemScanMem8 (Buffer, Length, Value);
 }