Fix GCC build break.

[mirror_edk2.git] / MdePkg / Library / BaseMemoryLib / SetMem32Wrapper.c

diff --git a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
index 7217b6ef9b126d5316b5a1fd6b31ef93f7b01878..c1fa701fe028bc8ad69c23225c2c531810b5ff1e 100644 (file)
--- a/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
+++ b/MdePkg/Library/BaseMemoryLib/SetMem32Wrapper.c
@@ -1,6 +1,16 @@
 /** @file\r
   SetMem32() implementation.\r
 \r
+  The following BaseMemoryLib instances contain the same copy of this file:\r
+    BaseMemoryLib\r
+    BaseMemoryLibMmx\r
+    BaseMemoryLibSse2\r
+    BaseMemoryLibRepStr\r
+    BaseMemoryLibOptDxe\r
+    BaseMemoryLibOptPei\r
+    PeiMemoryLib\r
+    DxeMemoryLib\r
+\r
   Copyright (c) 2006, Intel Corporation<BR>\r
   All rights reserved. This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -10,20 +20,12 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-  Module Name:  SetMem32Wrapper.c\r
+**/\r
 \r
-  The following BaseMemoryLib instances share the same version of this file:\r
 \r
-    BaseMemoryLib\r
-    BaseMemoryLibMmx\r
-    BaseMemoryLibSse2\r
-    BaseMemoryLibRepStr\r
-    PeiMemoryLib\r
-    UefiMemoryLib\r
 \r
-**/\r
 \r
-#include "MemLibWrappers.h"\r
+#include "MemLibInternals.h"\r
 \r
 /**\r
   Fills a target buffer with a 32-bit value, and returns the target buffer.\r
@@ -32,7 +34,7 @@
   Value, and returns Buffer. Value is repeated every 32-bits in for Length\r
   bytes of Buffer.\r
 \r
-  If Buffer is NULL and Length > 0, then ASSERT().\r
+  If Length > 0 and Buffer is NULL, then ASSERT().\r
   If Length is greater than (MAX_ADDRESS - Buffer + 1), then ASSERT().\r
   If Buffer is not aligned on a 32-bit boundary, then ASSERT().\r
   If Length is not aligned on a 32-bit boundary, then ASSERT().\r
@@ -41,24 +43,25 @@
   @param  Length  Number of bytes in Buffer to fill.\r
   @param  Value   Value with which to fill Length bytes of Buffer.\r
 \r
-  @return Buffer\r
+  @return Buffer.\r
 \r
 **/\r
 VOID *\r
 EFIAPI\r
 SetMem32 (\r
-  OUT     VOID                      *Buffer,\r
-  IN      UINTN                     Length,\r
-  IN      UINT32                    Value\r
+  OUT VOID   *Buffer,\r
+  IN UINTN   Length,\r
+  IN UINT32  Value\r
   )\r
 {\r
-  ASSERT (Buffer != NULL);\r
-  ASSERT (Length <= MAX_ADDRESS - (UINTN)Buffer + 1);\r
-  ASSERT ((((UINTN)Buffer) & 1) != 0);\r
-  ASSERT ((Length & 1) != 0);\r
-\r
-  if ((Length /= sizeof (Value)) == 0) {\r
+  if (Length == 0) {\r
     return Buffer;\r
   }\r
-  return InternalMemSetMem32 (Buffer, Length, Value);\r
+\r
+  ASSERT (Buffer != NULL);\r
+  ASSERT ((Length - 1) <= (MAX_ADDRESS - (UINTN)Buffer));\r
+  ASSERT ((((UINTN)Buffer) & (sizeof (Value) - 1)) == 0);\r
+  ASSERT ((Length & (sizeof (Value) - 1)) == 0);\r
+\r
+  return InternalMemSetMem32 (Buffer, Length / sizeof (Value), Value);\r
 }\r