NetworkPkg: Change use of EFI_D_* to DEBUG_*

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>

3 files changed, 23 insertions, 24 deletions

diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c
index 7285b0fbeb..7024821515 100644
--- a/NetworkPkg/HttpDxe/HttpImpl.c
+++ b/NetworkPkg/HttpDxe/HttpImpl.c
@@ -362,7 +362,7 @@ EfiHttpRequest (
     //

     if (!PcdGetBool (PcdAllowHttpConnections) && !(HttpInstance->UseHttps)) {

 

-      DEBUG ((EFI_D_ERROR, "EfiHttpRequest: HTTP is disabled.\n"));

+      DEBUG ((DEBUG_ERROR, "EfiHttpRequest: HTTP is disabled.\n"));

 

       return EFI_ACCESS_DENIED;

     }

@@ -531,7 +531,7 @@ EfiHttpRequest (
 

       FreePool (HostNameStr);

       if (EFI_ERROR (Status)) {

-        DEBUG ((EFI_D_ERROR, "Error: Could not retrieve the host address from DNS server.\n"));

+        DEBUG ((DEBUG_ERROR, "Error: Could not retrieve the host address from DNS server.\n"));

         goto Error1;

       }

     }

diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c
index affa916bd6..227c093f20 100644
--- a/NetworkPkg/HttpDxe/HttpProto.c
+++ b/NetworkPkg/HttpDxe/HttpProto.c
@@ -145,7 +145,7 @@ HttpTcpReceiveNotifyDpc (
     Wrap->TcpWrap.Rx6Token.CompletionToken.Event = NULL;

 

     if (EFI_ERROR (Wrap->TcpWrap.Rx6Token.CompletionToken.Status)) {

-      DEBUG ((EFI_D_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx6Token.CompletionToken.Status));

+      DEBUG ((DEBUG_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx6Token.CompletionToken.Status));

       Wrap->HttpToken->Status = Wrap->TcpWrap.Rx6Token.CompletionToken.Status;

       gBS->SignalEvent (Wrap->HttpToken->Event);

 

@@ -165,7 +165,7 @@ HttpTcpReceiveNotifyDpc (
     Wrap->TcpWrap.Rx4Token.CompletionToken.Event = NULL;

 

     if (EFI_ERROR (Wrap->TcpWrap.Rx4Token.CompletionToken.Status)) {

-      DEBUG ((EFI_D_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx4Token.CompletionToken.Status));

+      DEBUG ((DEBUG_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx4Token.CompletionToken.Status));

       Wrap->HttpToken->Status = Wrap->TcpWrap.Rx4Token.CompletionToken.Status;

       gBS->SignalEvent (Wrap->HttpToken->Event);

 

@@ -968,7 +968,7 @@ HttpCreateConnection (
     Status = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->Tcp4ConnToken);

     HttpNotify (HttpEventConnectTcp, Status);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));

       return Status;

     }

 

@@ -984,7 +984,7 @@ HttpCreateConnection (
     Status = HttpInstance->Tcp6->Connect (HttpInstance->Tcp6, &HttpInstance->Tcp6ConnToken);

     HttpNotify (HttpEventConnectTcp, Status);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "HttpCreateConnection: Tcp6->Connect() = %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp6->Connect() = %r\n", Status));

       return Status;

     }

 

@@ -1109,7 +1109,7 @@ HttpConfigureTcp4 (
 

   Status = HttpInstance->Tcp4->Configure (HttpInstance->Tcp4, Tcp4CfgData);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "HttpConfigureTcp4 - %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "HttpConfigureTcp4 - %r\n", Status));

     return Status;

   }

 

@@ -1179,7 +1179,7 @@ HttpConfigureTcp6 (
 

   Status = HttpInstance->Tcp6->Configure (HttpInstance->Tcp6, Tcp6CfgData);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "HttpConfigureTcp6 - %r\n", Status));

+    DEBUG ((DEBUG_ERROR, "HttpConfigureTcp6 - %r\n", Status));

     return Status;

   }

 

@@ -1232,7 +1232,7 @@ HttpConnectTcp4 (
                                  NULL

                                  );

   if (EFI_ERROR(Status)){

-    DEBUG ((EFI_D_ERROR, "Tcp4 GetModeData fail - %x\n", Status));

+    DEBUG ((DEBUG_ERROR, "Tcp4 GetModeData fail - %x\n", Status));

     return Status;

   }

 

@@ -1244,7 +1244,7 @@ HttpConnectTcp4 (
 

   Status = HttpCreateConnection (HttpInstance);

   if (EFI_ERROR(Status)){

-    DEBUG ((EFI_D_ERROR, "Tcp4 Connection fail - %x\n", Status));

+    DEBUG ((DEBUG_ERROR, "Tcp4 Connection fail - %x\n", Status));

     return Status;

   }

 

@@ -1325,7 +1325,7 @@ HttpConnectTcp6 (
                                  );

 

   if (EFI_ERROR(Status)){

-     DEBUG ((EFI_D_ERROR, "Tcp6 GetModeData fail - %x\n", Status));

+     DEBUG ((DEBUG_ERROR, "Tcp6 GetModeData fail - %x\n", Status));

      return Status;

   }

 

@@ -1337,7 +1337,7 @@ HttpConnectTcp6 (
 

   Status = HttpCreateConnection (HttpInstance);

   if (EFI_ERROR(Status)){

-    DEBUG ((EFI_D_ERROR, "Tcp6 Connection fail - %x\n", Status));

+    DEBUG ((DEBUG_ERROR, "Tcp6 Connection fail - %x\n", Status));

     return Status;

   }

 

@@ -1587,7 +1587,7 @@ HttpTransmitTcp (
     Wrap->TcpWrap.IsTxDone = FALSE;

     Status  = Tcp4->Transmit (Tcp4, Tx4Token);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Transmit failed: %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));

       goto ON_ERROR;

     }

 

@@ -1610,7 +1610,7 @@ HttpTransmitTcp (
     Wrap->TcpWrap.IsTxDone = FALSE;

     Status = Tcp6->Transmit (Tcp6, Tx6Token);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Transmit failed: %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));

       goto ON_ERROR;

     }

   }

@@ -1875,7 +1875,7 @@ HttpTcpReceiveHeader (
         Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;

         Status = Tcp4->Receive (Tcp4, Rx4Token);

         if (EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));

+          DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));

           return Status;

         }

 

@@ -1907,7 +1907,7 @@ HttpTcpReceiveHeader (
 

         Status = HttpsReceive (HttpInstance, &Fragment, Timeout);

         if (EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));

+          DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));

           return Status;

         }

       }

@@ -1975,7 +1975,7 @@ HttpTcpReceiveHeader (
         Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;

         Status = Tcp6->Receive (Tcp6, Rx6Token);

         if (EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));

+          DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));

           return Status;

         }

 

@@ -2007,7 +2007,7 @@ HttpTcpReceiveHeader (
 

         Status = HttpsReceive (HttpInstance, &Fragment, Timeout);

         if (EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));

+          DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));

           return Status;

         }

       }

@@ -2111,7 +2111,7 @@ HttpTcpReceiveBody (
 

     Status = Tcp6->Receive (Tcp6, Rx6Token);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));

       return Status;

     }

   } else {

@@ -2123,7 +2123,7 @@ HttpTcpReceiveBody (
     Rx4Token->CompletionToken.Status = EFI_NOT_READY;

     Status = Tcp4->Receive (Tcp4, Rx4Token);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));

+      DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));

       return Status;

     }

   }

diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c b/NetworkPkg/HttpDxe/HttpsSupport.c
index 0f28ae9447..d503e38515 100644
--- a/NetworkPkg/HttpDxe/HttpsSupport.c
+++ b/NetworkPkg/HttpDxe/HttpsSupport.c
@@ -680,7 +680,7 @@ TlsConfigureSession (
   //

   Status = TlsConfigCipherList (HttpInstance);

   if (EFI_ERROR (Status) && Status != EFI_NOT_FOUND) {

-    DEBUG ((EFI_D_ERROR, "TlsConfigCipherList: return %r error.\n", Status));

+    DEBUG ((DEBUG_ERROR, "TlsConfigCipherList: return %r error.\n", Status));

     return Status;

   }

 

@@ -689,7 +689,7 @@ TlsConfigureSession (
   //

   Status = TlsConfigCertificate (HttpInstance);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "TLS Certificate Config Error!\n"));

+    DEBUG ((DEBUG_ERROR, "TLS Certificate Config Error!\n"));

     return Status;

   }

 

@@ -1874,7 +1874,7 @@ HttpsReceive (
     FreePool (GetSessionDataBuffer);

 

     if(HttpInstance->TlsSessionState == EfiTlsSessionError) {

-      DEBUG ((EFI_D_ERROR, "TLS Session State Error!\n"));

+      DEBUG ((DEBUG_ERROR, "TLS Session State Error!\n"));

       return EFI_ABORTED;

     }

 

@@ -1887,4 +1887,3 @@ HttpsReceive (
 

   return Status;

 }

-