MdeModulePkg: 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: Liming Gao <gaoliming@byosoft.com.cn>

4 files changed, 14 insertions, 14 deletions

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
index 814c5400fe..060abef3ab 100644
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
@@ -489,7 +489,7 @@ GetEfiSysPartitionFromActiveBootOption(
       continue;

     }

 

-    DEBUG_CODE (

+    DEBUG_CODE_BEGIN ();

       CHAR16 *DevicePathStr;

 

       DevicePathStr = ConvertDevicePathToText(DevicePath, TRUE, TRUE);

@@ -499,7 +499,7 @@ GetEfiSysPartitionFromActiveBootOption(
       } else {

         DEBUG((DEBUG_INFO, "DevicePathToStr failed\n"));

       }

-    );

+    DEBUG_CODE_END ();

 

     CurFullPath = NULL;

     //

@@ -521,7 +521,7 @@ GetEfiSysPartitionFromActiveBootOption(
         break;

       }

 

-      DEBUG_CODE (

+      DEBUG_CODE_BEGIN ();

         CHAR16 *DevicePathStr1;

 

         DevicePathStr1 = ConvertDevicePathToText(CurFullPath, TRUE, TRUE);

@@ -529,7 +529,7 @@ GetEfiSysPartitionFromActiveBootOption(
           DEBUG((DEBUG_INFO, "Full device path %s\n", DevicePathStr1));

           FreePool(DevicePathStr1);

         }

-      );

+      DEBUG_CODE_END ();

 

       //

       // Make sure the boot option device path connected.

@@ -587,7 +587,7 @@ GetEfiSysPartitionFromActiveBootOption(
     Status = EFI_NOT_FOUND;

   }

 

-  DEBUG_CODE (

+  DEBUG_CODE_BEGIN ();

     CHAR16 *DevicePathStr2;

     if (*FsHandle != NULL) {

       DevicePathStr2 = ConvertDevicePathToText(CurFullPath, TRUE, TRUE);

@@ -598,7 +598,7 @@ GetEfiSysPartitionFromActiveBootOption(
     } else {

       DEBUG((DEBUG_INFO, "Failed to found Active EFI System Partion\n"));

     }

-  );

+  DEBUG_CODE_END ();

 

   if (CurFullPath != NULL) {

     FreePool(CurFullPath);

@@ -990,13 +990,13 @@ GetFileImageInAlphabetFromDir(
     FileCount++;

   }

 

-  DEBUG_CODE (

+  DEBUG_CODE_BEGIN ();

     for (Link = FileInfoList.ForwardLink; Link != &FileInfoList; Link = Link->ForwardLink) {

       FileInfoEntry = CR (Link, FILE_INFO_ENTRY, Link, FILE_INFO_SIGNATURE);

       FileInfo      = FileInfoEntry->FileInfo;

       DEBUG((DEBUG_INFO, "Successfully read capsule file %s from disk.\n", FileInfo->FileName));

     }

-  );

+  DEBUG_CODE_END ();

 

 EXIT:

 

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index a862e04a89..a7261d64f0 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -1387,7 +1387,7 @@ BmExpandLoadFile (
   //

   FileBuffer = AllocateReservedPages (EFI_SIZE_TO_PAGES (BufferSize));

   if (FileBuffer == NULL) {

-    DEBUG_CODE (

+    DEBUG_CODE_BEGIN ();

       EFI_DEVICE_PATH *LoadFilePath;

       CHAR16          *LoadFileText;

       CHAR16          *FileText;

@@ -1417,7 +1417,7 @@ BmExpandLoadFile (
       if (LoadFileText != NULL) {

         FreePool (LoadFileText);

       }

-      );

+    DEBUG_CODE_END ();

     return NULL;

   }

 

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
index 2a850f2953..eacd45439b 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
@@ -545,7 +545,7 @@ BmRepairAllControllers (
   EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);

 

 

-  DEBUG_CODE (

+  DEBUG_CODE_BEGIN ();

     CHAR16 *ControllerName;

 

     DriverHealthInfo = EfiBootManagerGetDriverHealthInfo (&Count);

@@ -567,7 +567,7 @@ BmRepairAllControllers (
       }

     }

     EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);

-    );

+  DEBUG_CODE_END ();

 

   if (ReconnectRequired) {

     if (ReconnectRepairCount < MAX_RECONNECT_REPAIR) {

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
index f32499e34b..6bac4bce9d 100644
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
@@ -286,7 +286,7 @@ ParseFv (
                     );

     ASSERT_EFI_ERROR (Status);

 

-    DEBUG_CODE (

+    DEBUG_CODE_BEGIN ();

       EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL   *Fvb2;

       EFI_PHYSICAL_ADDRESS                  FvAddress;

       UINT64                                FvSize;

@@ -303,7 +303,7 @@ ParseFv (
         FvSize = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvAddress)->FvLength;

         DEBUG ((DEBUG_INFO , "FvSize    - 0x%08x\n", FvSize));

       }

-    );

+    DEBUG_CODE_END ();

 

     if (ScanAll) {

       //