Code clean up in NetLib:

1. Add GLOBAL_REMOVE_IF_UNREFERENCED to all globals
2. Update NTOHL and NTOHS to be BaseLib func SwapBytes32/SwapBytes16
3. Remove duplicate NET_SWAP_SHORT (to use NTOHS instead)

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9648 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 7 insertions, 3 deletions

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index b29e6cb672..9bea6b298b 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
@@ -799,7 +799,7 @@ TcpInput (
       Tcb     = TcpCloneTcb (Parent);

       if (Tcb == NULL) {

         DEBUG ((EFI_D_ERROR, "TcpInput: discard a segment because"

-          "failed to clone a child for TCB%x\n", Tcb));

+          " failed to clone a child for TCB%x\n", Tcb));

 

         goto DISCARD;

       }

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 8c0293dccd..0014fc993f 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -1090,18 +1090,22 @@ TcpInstallDevicePath (
   TCP_CB             *Tcb;

   IPv4_DEVICE_PATH   Ip4DPathNode;

   EFI_STATUS         Status;

+  TCP_PORTNO         LocalPort;

+  TCP_PORTNO         RemotePort;

 

   TcpProto   = (TCP4_PROTO_DATA *) Sock->ProtoReserved;

   TcpService = TcpProto->TcpService;

   Tcb        = TcpProto->TcpPcb;

 

+  LocalPort = NTOHS (Tcb->LocalEnd.Port);

+  RemotePort = NTOHS (Tcb->RemoteEnd.Port);

   NetLibCreateIPv4DPathNode (

     &Ip4DPathNode,

     TcpService->ControllerHandle,

     Tcb->LocalEnd.Ip,

-    NTOHS (Tcb->LocalEnd.Port),

+    LocalPort,

     Tcb->RemoteEnd.Ip,

-    NTOHS (Tcb->RemoteEnd.Port),

+    RemotePort,

     EFI_IP_PROTO_TCP,

     Tcb->UseDefaultAddr

     );