NetworkPkg: Change complex DEBUG_CODE() to DEBUG_CODE_BEGIN/END()

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

Update use of DEBUG_CODE(Expression) if Expression is a complex code
block with if/while/for/case statements that use {}.

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>

diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c
index fe92a9855ceb6b937c93c575d0678910f297cc60..ad5cb3cf7be4f3d17d3bbd7b6e0c2c7cf2e1fc72 100644 (file)
--- a/NetworkPkg/ArpDxe/ArpImpl.c
+++ b/NetworkPkg/ArpDxe/ArpImpl.c
@@ -304,12 +304,12 @@ RESTART_RECEIVE:
   //\r
   Status = ArpService->Mnp->Receive (ArpService->Mnp, RxToken);\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_ERROR, "ArpOnFrameRcvd: ArpService->Mnp->Receive "\r
         "failed, %r\n.", Status));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 }\r
 \r
 /**\r
@@ -358,11 +358,11 @@ ArpOnFrameSentDpc (
   TxToken = (EFI_MANAGED_NETWORK_COMPLETION_TOKEN *)Context;\r
   TxData  = TxToken->Packet.TxData;\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     if (EFI_ERROR (TxToken->Status)) {\r
       DEBUG ((DEBUG_ERROR, "ArpOnFrameSent: TxToken->Status, %r.\n", TxToken->Status));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // Free the allocated memory and close the event.\r

diff --git a/NetworkPkg/MnpDxe/MnpConfig.c b/NetworkPkg/MnpDxe/MnpConfig.c
index b27bc2e1f67f2bf4d942deaac5ef9d7f78b9194a..1e9b3905860eb14c659155707e6feefb3ecb3be1 100644 (file)
--- a/NetworkPkg/MnpDxe/MnpConfig.c
+++ b/NetworkPkg/MnpDxe/MnpConfig.c
@@ -1669,7 +1669,7 @@ MnpConfigReceiveFilters (
                   MCastFilterCnt,\r
                   MCastFilter\r
                   );\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     if (EFI_ERROR (Status)) {\r
       DEBUG (\r
         (DEBUG_ERROR,\r
@@ -1677,7 +1677,7 @@ MnpConfigReceiveFilters (
         Status)\r
         );\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   if (MCastFilter != NULL) {\r
     //\r

diff --git a/NetworkPkg/MnpDxe/MnpIo.c b/NetworkPkg/MnpDxe/MnpIo.c
index 1f8d2e25043e798b0bd971b9a2b4165d8f89d605..d5707ae26a3ab96bb9f2738fd58c9496e94c012b 100644 (file)
--- a/NetworkPkg/MnpDxe/MnpIo.c
+++ b/NetworkPkg/MnpDxe/MnpIo.c
@@ -898,11 +898,11 @@ MnpReceivePacket (
   //\r
   Status = Snp->Receive (Snp, &HeaderSize, &BufLen, BufPtr, NULL, NULL, NULL);\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
       if (Status != EFI_NOT_READY) {\r
         DEBUG ((DEBUG_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));\r
       }\r
-    );\r
+    DEBUG_CODE_END ();\r
 \r
     return Status;\r
   }\r