Clean up the following module msa files, they are three networt and two PCD modules.

[mirror_edk2.git] / EdkModulePkg / Universal / Network / PxeBc / Dxe / pxe_bc_dhcp.c

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index 2e22fc5a350c7bf57e3b86e6cf1fc6acf786698e..56893bce2fbe4edf722a4e0ba52f220cee0d5bc8 100644 (file)
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2007, Intel Corporation\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
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -2223,12 +2223,12 @@ FreeMem (
   )\r
 {\r
   if (Private->TransmitBuffer != NULL) {\r
-    gBS->FreePool (Private->TransmitBuffer);\r
+    FreePool (Private->TransmitBuffer);\r
     Private->TransmitBuffer = NULL;\r
   }\r
 \r
   if (Private->ReceiveBuffers != NULL) {\r
-    gBS->FreePool (Private->ReceiveBuffers);\r
+    FreePool (Private->ReceiveBuffers);\r
     Private->ReceiveBuffers = NULL;\r
   }\r
 }\r
@@ -2240,48 +2240,29 @@ GetMem (
   PXE_BASECODE_DEVICE *Private\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
 \r
   if (Private->DhcpPacketBuffer == NULL) {\r
-    Status = gBS->AllocatePool (\r
-                    EfiBootServicesData,\r
-                    sizeof (DHCP_RECEIVE_BUFFER) * (PXE_BIS_INDEX + 1),\r
-                    &Private->DhcpPacketBuffer\r
-                    );\r
-\r
-    if (EFI_ERROR (Status) || Private->DhcpPacketBuffer == NULL) {\r
-      Private->DhcpPacketBuffer = NULL;\r
+    Private->DhcpPacketBuffer = AllocatePool (sizeof (DHCP_RECEIVE_BUFFER) * (PXE_BIS_INDEX + 1));\r
+    if (Private->DhcpPacketBuffer == NULL) {\r
       FreeMem (Private);\r
       return FALSE;\r
     }\r
   }\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (EFI_PXE_BASE_CODE_PACKET),\r
-                  &Private->TransmitBuffer\r
-                  );\r
-\r
-  if (EFI_ERROR (Status) || Private->TransmitBuffer == NULL) {\r
-    gBS->FreePool (Private->DhcpPacketBuffer);\r
+  Private->TransmitBuffer = AllocatePool (sizeof (EFI_PXE_BASE_CODE_PACKET));\r
+  if (Private->TransmitBuffer == NULL) {\r
+    FreePool (Private->DhcpPacketBuffer);\r
     Private->DhcpPacketBuffer = NULL;\r
-    Private->TransmitBuffer   = NULL;\r
     FreeMem (Private);\r
     return FALSE;\r
   }\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (DHCP_RECEIVE_BUFFER) * (MAX_OFFERS),\r
-                  &Private->ReceiveBuffers\r
-                  );\r
-\r
-  if (EFI_ERROR (Status) || Private->ReceiveBuffers == NULL) {\r
-    gBS->FreePool (Private->TransmitBuffer);\r
-    gBS->FreePool (Private->DhcpPacketBuffer);\r
+  Private->ReceiveBuffers = AllocatePool (sizeof (DHCP_RECEIVE_BUFFER) * (MAX_OFFERS));\r
+  if (Private->ReceiveBuffers == NULL) {\r
+    FreePool (Private->TransmitBuffer);\r
+    FreePool (Private->DhcpPacketBuffer);\r
     Private->DhcpPacketBuffer = NULL;\r
     Private->TransmitBuffer   = NULL;\r
-    Private->ReceiveBuffers   = NULL;\r
     FreeMem (Private);\r
     return FALSE;\r
   }\r
@@ -2920,7 +2901,6 @@ Returns:
   PXE_SERVER_LISTS                DefaultSrvList;\r
   PXE_SERVER_LISTS                *ServerListPtr;\r
   PXE_SERVER_LISTS                *McastServerListPtr;\r
-  EFI_STATUS                      Status;\r
   UNION_PTR                       LocalPtr;\r
   UINTN                           Index;\r
   UINTN                           Index2;\r
@@ -3120,14 +3100,11 @@ Returns:
     }\r
 \r
     if (ServerListPtr == NULL) {\r
-      Status = gBS->AllocatePool (\r
-                      EfiBootServicesData,\r
-                      sizeof (PXEV4_SERVER_LIST) + (Index2 - 1) * sizeof (EFI_IPv4_ADDRESS),\r
-                      (VOID **) &ServerListPtr\r
+      ServerListPtr = AllocatePool (\r
+                        sizeof (PXEV4_SERVER_LIST) + (Index2 - 1) * sizeof (EFI_IPv4_ADDRESS)\r
                       );\r
 \r
-      if (EFI_ERROR (Status) || ServerListPtr == NULL) {\r
-        ServerListPtr = NULL;\r
+      if (ServerListPtr == NULL) {\r
         EfiReleaseLock (&Private->Lock);\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
@@ -3173,7 +3150,7 @@ Returns:
               );\r
 \r
   if (AcquiredSrvList) {\r
-    gBS->FreePool (ServerListPtr);\r
+    FreePool (ServerListPtr);\r
   }\r
 \r
   FreeMem (Private);\r
@@ -3219,7 +3196,6 @@ Returns:
 --*/\r
 {\r
   EFI_PXE_BASE_CODE_MODE  *PxebcMode;\r
-  EFI_STATUS              Status;\r
   PXE_BASECODE_DEVICE     *Private;\r
 \r
   //\r
@@ -3249,14 +3225,8 @@ Returns:
   PxebcMode = Private->EfiBc.Mode;\r
 \r
   if (Private->DhcpPacketBuffer == NULL) {\r
-    Status = gBS->AllocatePool (\r
-                    EfiBootServicesData,\r
-                    sizeof (DHCP_RECEIVE_BUFFER) * (PXE_BIS_INDEX + 1),\r
-                    &Private->DhcpPacketBuffer\r
-                    );\r
-\r
-    if (EFI_ERROR (Status) || Private->DhcpPacketBuffer == NULL) {\r
-      Private->DhcpPacketBuffer = NULL;\r
+    Private->DhcpPacketBuffer = AllocatePool (sizeof (DHCP_RECEIVE_BUFFER) * (PXE_BIS_INDEX + 1));\r
+    if (Private->DhcpPacketBuffer == NULL) {\r
       EfiReleaseLock (&Private->Lock);\r
       return EFI_OUT_OF_RESOURCES;\r
     }\r