X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FMtftp4Dxe%2FMtftp4Wrq.c;h=12b4c4a4a15d81f0f82abc5075ad9f0a2c753e55;hp=5ac5dc8ec020472ab4fab7b531dbb01518115ae0;hb=e48e37fce2611df7a52aff271835ff72ee396d9b;hpb=772db4bb33ae66fa20e39f786b5f80d107d450a5

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 5ac5dc8ec0..12b4c4a4a1 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -131,7 +131,7 @@ Mtftp4WrqSendBlock (
 
     if (DataLen > 0) {
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);
-      NetCopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);
+      CopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);
     }
 
   } else {
@@ -139,7 +139,7 @@ Mtftp4WrqSendBlock (
     // Get data from PacketNeeded
     //
     DataBuf = NULL;
-    Status  = Token->PacketNeeded (&Instance->Mtftp4, Token, &DataLen, &DataBuf);
+    Status  = Token->PacketNeeded (&Instance->Mtftp4, Token, &DataLen, (VOID **) &DataBuf);
 
     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {
       if (DataBuf != NULL) {
@@ -149,7 +149,7 @@ Mtftp4WrqSendBlock (
       Mtftp4SendError (
         Instance,
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,
-        "User aborted the transfer"
+        (UINT8 *) "User aborted the transfer"
         );
 
       return EFI_ABORTED;
@@ -162,7 +162,7 @@ Mtftp4WrqSendBlock (
 
     if (DataLen > 0) {
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);
-      NetCopyMem (Packet->Data.Data, DataBuf, DataLen);
+      CopyMem (Packet->Data.Data, DataBuf, DataLen);
       gBS->FreePool (DataBuf);
     }
   }
@@ -235,7 +235,7 @@ Mtftp4WrqHandleAck (
       Mtftp4SendError (
         Instance,
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,
-        "Block number rolls back, not supported, try blksize option"
+        (UINT8 *) "Block number rolls back, not supported, try blksize option"
         );
 
       return EFI_TFTP_ERROR;
@@ -327,7 +327,7 @@ Mtftp4WrqHandleOack (
   //
   // Parse and validate the options from server
   //
-  NetZeroMem (&Reply, sizeof (MTFTP4_OPTION));
+  ZeroMem (&Reply, sizeof (MTFTP4_OPTION));
   Status = Mtftp4ParseOptionOack (Packet, Len, &Reply);
 
   if (EFI_ERROR (Status) || !Mtftp4WrqOackValid (&Reply, &Instance->RequestOption)) {
@@ -339,7 +339,7 @@ Mtftp4WrqHandleOack (
       Mtftp4SendError (
         Instance,
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,
-        "Mal-formated OACK packet"
+        (UINT8 *) "Mal-formated OACK packet"
         );
     }
 
@@ -428,7 +428,7 @@ Mtftp4WrqInput (
   Len = UdpPacket->TotalSize;
 
   if (UdpPacket->BlockOpNum > 1) {
-    Packet = NetAllocatePool (Len);
+    Packet = AllocatePool (Len);
 
     if (Packet == NULL) {
       Status = EFI_OUT_OF_RESOURCES;
@@ -465,7 +465,7 @@ Mtftp4WrqInput (
         Mtftp4SendError (
           Instance,
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,
-          "User aborted the transfer"
+          (UINT8 *) "User aborted the transfer"
           );
       }
 
@@ -502,7 +502,7 @@ ON_EXIT:
   // restart the receive, otherwise end the session.
   //
   if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {
-    NetFreePool (Packet);
+    gBS->FreePool (Packet);
   }
 
   if (UdpPacket != NULL) {