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

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

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
index 4444b20d0012456990347b0d879c39d154b33e8d..ec2099eb7a7bfd8bc9c08a16f982296021d27049 100644 (file)
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
@@ -822,7 +822,7 @@ Returns:
     return NULL;\r
   }\r
 \r
-  if (BisHandleCount != sizeof BisHandleBuffer) {\r
+  if (BisHandleCount != sizeof (BisHandleBuffer)) {\r
     //\r
     // This really should never happen, but I am paranoid.\r
     //\r
@@ -1186,7 +1186,6 @@ BcStart (
 {\r
   EFI_SIMPLE_NETWORK_PROTOCOL *SnpPtr;\r
   EFI_SIMPLE_NETWORK_MODE     *SnpModePtr;\r
-  EFI_STATUS                  Status;\r
   EFI_STATUS                  StatCode;\r
   PXE_BASECODE_DEVICE         *Private;\r
 \r
@@ -1364,54 +1363,34 @@ BcStart (
   //\r
   // Allocate Tx/Rx buffers\r
   //\r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  BUFFER_ALLOCATE_SIZE,\r
-                  (VOID **) &Private->TransmitBufferPtr\r
-                  );\r
-\r
-  if (!EFI_ERROR (Status)) {\r
-    ZeroMem (Private->TransmitBufferPtr, BUFFER_ALLOCATE_SIZE);\r
-  } else {\r
+  Private->TransmitBufferPtr = AllocateZeroPool (BUFFER_ALLOCATE_SIZE);\r
+  if (Private->TransmitBufferPtr == NULL) {\r
     DEBUG ((EFI_D_NET, "\nBcStart()  Could not alloc TxBuf.\n"));\r
     EfiReleaseLock (&Private->Lock);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  BUFFER_ALLOCATE_SIZE,\r
-                  (VOID **) &Private->ReceiveBufferPtr\r
-                  );\r
-\r
-  if (!EFI_ERROR (Status)) {\r
-    ZeroMem (Private->ReceiveBufferPtr, BUFFER_ALLOCATE_SIZE);\r
-  } else {\r
+  Private->ReceiveBufferPtr = AllocateZeroPool (BUFFER_ALLOCATE_SIZE);\r
+  if (Private->ReceiveBufferPtr == NULL) {\r
     DEBUG ((EFI_D_NET, "\nBcStart()  Could not alloc RxBuf.\n"));\r
-    gBS->FreePool (Private->TransmitBufferPtr);\r
+    FreePool (Private->TransmitBufferPtr);\r
     EfiReleaseLock (&Private->Lock);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  256,\r
-                  (VOID **) &Private->TftpErrorBuffer\r
-                  );\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (Private->ReceiveBufferPtr);\r
-    gBS->FreePool (Private->TransmitBufferPtr);\r
+  Private->TftpErrorBuffer = AllocatePool (256);\r
+  if (Private->TftpErrorBuffer == NULL) {\r
+    FreePool (Private->ReceiveBufferPtr);\r
+    FreePool (Private->TransmitBufferPtr);\r
     EfiReleaseLock (&Private->Lock);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->AllocatePool (EfiBootServicesData, 256, (VOID **) &Private->TftpAckBuffer);\r
-\r
-  if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (Private->TftpErrorBuffer);\r
-    gBS->FreePool (Private->ReceiveBufferPtr);\r
-    gBS->FreePool (Private->TransmitBufferPtr);\r
+  Private->TftpAckBuffer = AllocatePool (256);\r
+  if (Private->TftpAckBuffer == NULL) {\r
+    FreePool (Private->TftpErrorBuffer);\r
+    FreePool (Private->ReceiveBufferPtr);\r
+    FreePool (Private->TransmitBufferPtr);\r
     EfiReleaseLock (&Private->Lock);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -1546,27 +1525,27 @@ BcStop (
   }\r
 \r
   if (Private->TransmitBufferPtr != NULL) {\r
-    gBS->FreePool (Private->TransmitBufferPtr);\r
+    FreePool (Private->TransmitBufferPtr);\r
     Private->TransmitBufferPtr = NULL;\r
   }\r
 \r
   if (Private->ReceiveBufferPtr != NULL) {\r
-    gBS->FreePool (Private->ReceiveBufferPtr);\r
+    FreePool (Private->ReceiveBufferPtr);\r
     Private->ReceiveBufferPtr = NULL;\r
   }\r
 \r
   if (Private->ArpBuffer != NULL) {\r
-    gBS->FreePool (Private->ArpBuffer);\r
+    FreePool (Private->ArpBuffer);\r
     Private->ArpBuffer = NULL;\r
   }\r
 \r
   if (Private->TftpErrorBuffer != NULL) {\r
-    gBS->FreePool (Private->TftpErrorBuffer);\r
+    FreePool (Private->TftpErrorBuffer);\r
     Private->TftpErrorBuffer = NULL;\r
   }\r
 \r
   if (Private->TftpAckBuffer != NULL) {\r
-    gBS->FreePool (Private->TftpAckBuffer);\r
+    FreePool (Private->TftpAckBuffer);\r
     Private->TftpAckBuffer = NULL;\r
   }\r
 \r
@@ -2118,46 +2097,26 @@ PxeBcDriverStart (
   //\r
   // Allocate structures needed by BaseCode and LoadFile protocols.\r
   //\r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (PXE_BASECODE_DEVICE),\r
-                  (VOID **) &Private\r
-                  );\r
+  Private = AllocateZeroPool (sizeof (PXE_BASECODE_DEVICE));\r
 \r
-  if (!EFI_ERROR (Status)) {\r
-    ZeroMem (Private, sizeof (PXE_BASECODE_DEVICE));\r
-  } else {\r
+  if (Private == NULL ) {\r
     DEBUG ((EFI_D_NET, "\nBcNotifySnp()  Could not alloc PXE_BASECODE_DEVICE structure.\n"));\r
-    return Status;\r
+    return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (LOADFILE_DEVICE),\r
-                  (VOID **) &pLF\r
-                  );\r
-\r
-  if (!EFI_ERROR (Status)) {\r
-    ZeroMem (pLF, sizeof (LOADFILE_DEVICE));\r
-  } else {\r
+  pLF = AllocateZeroPool (sizeof (LOADFILE_DEVICE));\r
+  if (pLF == NULL) {\r
     DEBUG ((EFI_D_NET, "\nBcNotifySnp()  Could not alloc LOADFILE_DEVICE structure.\n"));\r
-    gBS->FreePool (Private);\r
-    return Status;\r
+    FreePool (Private);\r
+    return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (EFI_PXE_BASE_CODE_MODE),\r
-                  (VOID **) &Private->EfiBc.Mode\r
-                  );\r
-\r
-  if (!EFI_ERROR (Status)) {\r
-    ZeroMem (Private->EfiBc.Mode, sizeof (EFI_PXE_BASE_CODE_MODE));\r
-  } else {\r
+  Private->EfiBc.Mode = AllocateZeroPool (sizeof (EFI_PXE_BASE_CODE_MODE));\r
+  if (Private->EfiBc.Mode == NULL) {\r
     DEBUG ((EFI_D_NET, "\nBcNotifySnp()  Could not alloc Mode structure.\n"));\r
-    gBS->FreePool (Private);\r
-    gBS->FreePool (pLF);\r
-    return Status;\r
+    FreePool (Private);\r
+    FreePool (pLF);\r
+    return EFI_OUT_OF_RESOURCES;\r
   }\r
   //\r
   // Lock access, just in case\r
@@ -2298,9 +2257,9 @@ PxeBcDriverStart (
   return Status;\r
 \r
 PxeBcError: ;\r
-  gBS->FreePool (Private->EfiBc.Mode);\r
-  gBS->FreePool (Private);\r
-  gBS->FreePool (pLF);\r
+  FreePool (Private->EfiBc.Mode);\r
+  FreePool (Private);\r
+  FreePool (pLF);\r
   return Status;\r
 }\r
 \r
@@ -2370,9 +2329,9 @@ PxeBcDriverStop (
                     Controller\r
                     );\r
 \r
-    gBS->FreePool (LoadDevice->Private->EfiBc.Mode);\r
-    gBS->FreePool (LoadDevice->Private);\r
-    gBS->FreePool (LoadDevice);\r
+    FreePool (LoadDevice->Private->EfiBc.Mode);\r
+    FreePool (LoadDevice->Private);\r
+    FreePool (LoadDevice);\r
   }\r
 \r
   return Status;\r