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>

diff --git a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
index 712cf2e1f74de92c921a2716c8f92d2895438917..77f9a1571fb676bd0948f56e6acc24359bccaf41 100644 (file)
--- a/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
+++ b/MdeModulePkg/Application/CapsuleApp/CapsuleOnDisk.c
@@ -336,7 +336,7 @@ GetEfiSysPartitionFromBootOptionFilePath (
       break;\r
     }\r
 \r
-    DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
       CHAR16 *DevicePathStr;\r
 \r
       DevicePathStr = ConvertDevicePathToText (CurFullPath, TRUE, TRUE);\r
@@ -344,7 +344,7 @@ GetEfiSysPartitionFromBootOptionFilePath (
         DEBUG ((DEBUG_INFO, "Full device path %s\n", DevicePathStr));\r
         FreePool (DevicePathStr);\r
       }\r
-    );\r
+    DEBUG_CODE_END ();\r
 \r
     Status = GetEfiSysPartitionFromDevPath (CurFullPath, &FsFullPath, Fs);\r
   } while (EFI_ERROR (Status));\r
@@ -468,7 +468,7 @@ GetUpdateFileSystem (
       continue;\r
     }\r
 \r
-    DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
       CHAR16 *DevicePathStr;\r
 \r
       DevicePathStr = ConvertDevicePathToText (DevicePath, TRUE, TRUE);\r
@@ -478,7 +478,7 @@ GetUpdateFileSystem (
       } else {\r
         DEBUG ((DEBUG_INFO, "DevicePathToStr failed\n"));\r
       }\r
-    );\r
+    DEBUG_CODE_END ();\r
 \r
     Status = GetEfiSysPartitionFromBootOptionFilePath (DevicePath, &FullPath, Fs);\r
     if (!EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
index a71518652d7855f3b4f4d405cb4a9c553b190ad9..5c8f0f46a18402836b35ac2de9f4d33e03972961 100644 (file)
--- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
+++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c
@@ -167,7 +167,7 @@ AddIoSpace (
     }\r
   }\r
 \r
-  DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
     //\r
     // Make sure there are adjacent descriptors covering [Base, Base + Length).\r
     // It is possible that they have not been merged; merging can be prevented\r
@@ -184,7 +184,7 @@ AddIoSpace (
       ASSERT_EFI_ERROR (CheckStatus);\r
       ASSERT (Descriptor.GcdIoType == EfiGcdIoTypeIo);\r
     }\r
-    );\r
+    DEBUG_CODE_END ();\r
 \r
 FreeIoSpaceMap:\r
   FreePool (IoSpaceMap);\r
@@ -315,7 +315,7 @@ AddMemoryMappedIoSpace (
     }\r
   }\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     //\r
     // Make sure there are adjacent descriptors covering [Base, Base + Length).\r
     // It is possible that they have not been merged; merging can be prevented\r
@@ -333,7 +333,7 @@ AddMemoryMappedIoSpace (
       ASSERT (Descriptor.GcdMemoryType == EfiGcdMemoryTypeMemoryMappedIo);\r
       ASSERT ((Descriptor.Capabilities & Capabilities) == Capabilities);\r
     }\r
-    );\r
+  DEBUG_CODE_END ();\r
 \r
 FreeMemorySpaceMap:\r
   FreePool (MemorySpaceMap);\r

diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
index 6518921516f38c7d5b58691f7eaf64f53ec6b721..2224aae281ec848965e45b8ade217898108c0221 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
+++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c
@@ -141,7 +141,7 @@ CoreDumpGcdMemorySpaceMap (
   BOOLEAN  InitialMap\r
   )\r
 {\r
-  DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
     EFI_STATUS                       Status;\r
     UINTN                            NumberOfDescriptors;\r
     EFI_GCD_MEMORY_SPACE_DESCRIPTOR  *MemorySpaceMap;\r
@@ -167,7 +167,7 @@ CoreDumpGcdMemorySpaceMap (
     }\r
     DEBUG ((DEBUG_GCD, "\n"));\r
     FreePool (MemorySpaceMap);\r
-  );\r
+    DEBUG_CODE_END ();\r
 }\r
 \r
 /**\r
@@ -183,7 +183,7 @@ CoreDumpGcdIoSpaceMap (
   BOOLEAN  InitialMap\r
   )\r
 {\r
-  DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
     EFI_STATUS                   Status;\r
     UINTN                        NumberOfDescriptors;\r
     EFI_GCD_IO_SPACE_DESCRIPTOR  *IoSpaceMap;\r
@@ -208,7 +208,7 @@ CoreDumpGcdIoSpaceMap (
     }\r
     DEBUG ((DEBUG_GCD, "\n"));\r
     FreePool (IoSpaceMap);\r
-  );\r
+    DEBUG_CODE_END ();\r
 }\r
 \r
 /**\r

diff --git a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c b/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
index 5b8ce55347341a52fd358eaaf267697dadd758c3..002a8e43606557c6af6702a16f4b18b52f2018ce 100644 (file)
--- a/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
+++ b/MdeModulePkg/Core/PiSmmCore/SmramProfileRecord.c
@@ -2734,12 +2734,12 @@ DumpSmramInfo (
   VOID\r
   )\r
 {\r
-  DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
     if (IS_SMRAM_PROFILE_ENABLED) {\r
       DumpSmramProfile ();\r
       DumpFreePagesList ();\r
       DumpFreePoolList ();\r
       DumpSmramRange ();\r
     }\r
-  );\r
+    DEBUG_CODE_END ();\r
 }\r

diff --git a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
index 814c5400fe890362cc97aca520628e348d161b2f..060abef3abcb50a80d400302a7db26636b98f309 100644 (file)
--- a/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
+++ b/MdeModulePkg/Library/DxeCapsuleLibFmp/CapsuleOnDisk.c
@@ -489,7 +489,7 @@ GetEfiSysPartitionFromActiveBootOption(
       continue;\r
     }\r
 \r
-    DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
       CHAR16 *DevicePathStr;\r
 \r
       DevicePathStr = ConvertDevicePathToText(DevicePath, TRUE, TRUE);\r
@@ -499,7 +499,7 @@ GetEfiSysPartitionFromActiveBootOption(
       } else {\r
         DEBUG((DEBUG_INFO, "DevicePathToStr failed\n"));\r
       }\r
-    );\r
+    DEBUG_CODE_END ();\r
 \r
     CurFullPath = NULL;\r
     //\r
@@ -521,7 +521,7 @@ GetEfiSysPartitionFromActiveBootOption(
         break;\r
       }\r
 \r
-      DEBUG_CODE (\r
+      DEBUG_CODE_BEGIN ();\r
         CHAR16 *DevicePathStr1;\r
 \r
         DevicePathStr1 = ConvertDevicePathToText(CurFullPath, TRUE, TRUE);\r
@@ -529,7 +529,7 @@ GetEfiSysPartitionFromActiveBootOption(
           DEBUG((DEBUG_INFO, "Full device path %s\n", DevicePathStr1));\r
           FreePool(DevicePathStr1);\r
         }\r
-      );\r
+      DEBUG_CODE_END ();\r
 \r
       //\r
       // Make sure the boot option device path connected.\r
@@ -587,7 +587,7 @@ GetEfiSysPartitionFromActiveBootOption(
     Status = EFI_NOT_FOUND;\r
   }\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     CHAR16 *DevicePathStr2;\r
     if (*FsHandle != NULL) {\r
       DevicePathStr2 = ConvertDevicePathToText(CurFullPath, TRUE, TRUE);\r
@@ -598,7 +598,7 @@ GetEfiSysPartitionFromActiveBootOption(
     } else {\r
       DEBUG((DEBUG_INFO, "Failed to found Active EFI System Partion\n"));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   if (CurFullPath != NULL) {\r
     FreePool(CurFullPath);\r
@@ -990,13 +990,13 @@ GetFileImageInAlphabetFromDir(
     FileCount++;\r
   }\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     for (Link = FileInfoList.ForwardLink; Link != &FileInfoList; Link = Link->ForwardLink) {\r
       FileInfoEntry = CR (Link, FILE_INFO_ENTRY, Link, FILE_INFO_SIGNATURE);\r
       FileInfo      = FileInfoEntry->FileInfo;\r
       DEBUG((DEBUG_INFO, "Successfully read capsule file %s from disk.\n", FileInfo->FileName));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
 EXIT:\r
 \r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index a862e04a89d500993c341a76e8f85d1c2fa963d0..a7261d64f0df594adc34bf72b0c57910e2e46517 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -1387,7 +1387,7 @@ BmExpandLoadFile (
   //\r
   FileBuffer = AllocateReservedPages (EFI_SIZE_TO_PAGES (BufferSize));\r
   if (FileBuffer == NULL) {\r
-    DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
       EFI_DEVICE_PATH *LoadFilePath;\r
       CHAR16          *LoadFileText;\r
       CHAR16          *FileText;\r
@@ -1417,7 +1417,7 @@ BmExpandLoadFile (
       if (LoadFileText != NULL) {\r
         FreePool (LoadFileText);\r
       }\r
-      );\r
+    DEBUG_CODE_END ();\r
     return NULL;\r
   }\r
 \r

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
index 2a850f2953548e0d111668310cdeb65f125a4559..eacd45439b13ab38aef902d2b7badf99d0e8cccc 100644 (file)
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c
@@ -545,7 +545,7 @@ BmRepairAllControllers (
   EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);\r
 \r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     CHAR16 *ControllerName;\r
 \r
     DriverHealthInfo = EfiBootManagerGetDriverHealthInfo (&Count);\r
@@ -567,7 +567,7 @@ BmRepairAllControllers (
       }\r
     }\r
     EfiBootManagerFreeDriverHealthInfo (DriverHealthInfo, Count);\r
-    );\r
+  DEBUG_CODE_END ();\r
 \r
   if (ReconnectRequired) {\r
     if (ReconnectRepairCount < MAX_RECONNECT_REPAIR) {\r

diff --git a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
index f32499e34bb74534b5c56e378dce497a55f4e0f2..6bac4bce9d072984497dab3b3a80c72b292ee46e 100644 (file)
--- a/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
+++ b/MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiGenFromFv.c
@@ -286,7 +286,7 @@ ParseFv (
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    DEBUG_CODE (\r
+    DEBUG_CODE_BEGIN ();\r
       EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL   *Fvb2;\r
       EFI_PHYSICAL_ADDRESS                  FvAddress;\r
       UINT64                                FvSize;\r
@@ -303,7 +303,7 @@ ParseFv (
         FvSize = ((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) FvAddress)->FvLength;\r
         DEBUG ((DEBUG_INFO , "FvSize    - 0x%08x\n", FvSize));\r
       }\r
-    );\r
+    DEBUG_CODE_END ();\r
 \r
     if (ScanAll) {\r
       //\r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
index 1e3c5b849994b808a512c80ff7640676ebe386a3..45c9b667cbd6aa52b042111f8368ed98662047c0 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/IA32/SetIdtEntry.c
@@ -38,7 +38,7 @@ SetIdtEntry (
   Status = InitializeCpuExceptionHandlers (NULL);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     //\r
     // Update IDT entry INT3 if the instruction is valid in it\r
     //\r
@@ -51,6 +51,5 @@ SetIdtEntry (
       IdtEntry->Bits.GateType       = IA32_IDT_GATE_TYPE_INTERRUPT_32;\r
       IdtEntry->Bits.OffsetHigh     = (UINT16)(S3DebugBuffer >> 16);\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 }\r
-\r

diff --git a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
index 0d448cc60e9340d6ef1d152013d2aae4dd132fdc..afb2d5c404d5f504f34bbe9fa2de51c48ebaf4b8 100644 (file)
--- a/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
+++ b/MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/X64/SetIdtEntry.c
@@ -149,7 +149,7 @@ SetIdtEntry (
   Status = InitializeCpuExceptionHandlers (NULL);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     //\r
     // Update IDT entry INT3 if the instruction is valid in it\r
     //\r
@@ -164,7 +164,7 @@ SetIdtEntry (
       IdtEntry->Bits.OffsetUpper    = (UINT32)(S3DebugBuffer >> 32);\r
       IdtEntry->Bits.Reserved_1     = 0;\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // If both BIOS and OS wants long mode waking vector,\r

diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
index 4b10567eb334512edd6087382b4dfde693afe0da..f70531638db2929c70b6667cd389f28ebbf94747 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -941,7 +941,7 @@ BdsEntry (
     OsIndication = 0;\r
   }\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     EFI_BOOT_MANAGER_LOAD_OPTION_TYPE LoadOptionType;\r
     DEBUG ((DEBUG_INFO, "[Bds]OsIndication: %016x\n", OsIndication));\r
     DEBUG ((DEBUG_INFO, "[Bds]=============Begin Load Options Dumping ...=============\n"));\r
@@ -963,7 +963,7 @@ BdsEntry (
       EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount);\r
     }\r
     DEBUG ((DEBUG_INFO, "[Bds]=============End Load Options Dumping=============\n"));\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // BootManagerMenu doesn't contain the correct information when return status is EFI_NOT_FOUND.\r

diff --git a/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.c b/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.c
index e9b12500820617dcec5af29246db3afb08a58004..aedbc663b3a9d36ac33de6a892297e4b6fddf987 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.c
+++ b/MdeModulePkg/Universal/CapsuleOnDiskLoadPei/CapsuleOnDiskLoadPei.c
@@ -282,7 +282,7 @@ InitializeCapsuleOnDiskLoad (
     return EFI_ABORTED;\r
   }\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
    VOID *CapsuleOnDiskModePpi;\r
 \r
   if (!IsCapsuleOnDiskMode()){\r
@@ -302,7 +302,7 @@ InitializeCapsuleOnDiskLoad (
       DEBUG((DEBUG_ERROR, "Locate CapsuleOnDiskModePpi error %x\n", Status));\r
       return Status;\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   Status = PeiServicesInstallPpi (&mCapsuleOnDiskPpiList);\r
   ASSERT_EFI_ERROR (Status);\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 838c3337c7f23b182e5178ff6fd0766be13b39cc..50c4d71005affcfe86301e398fe0c4e2f7397073 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -335,12 +335,12 @@ InitializeGraphicsConsoleTextMode (
     }\r
   }\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     for (Index = 0; Index < ValidCount; Index++) {\r
       DEBUG ((DEBUG_INFO, "Graphics - Mode %d, Column = %d, Row = %d\n",\r
                            Index, NewModeBuffer[Index].Columns, NewModeBuffer[Index].Rows));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // Return valid mode count and mode information buffer.\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index a98b690c8b9584f7905514bb11d95a5ae4aef827..89d6e7237d5c34e1d46e9deb3109a5bacca3c450 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -327,13 +327,13 @@ InitializeTerminalConsoleTextMode (
   }\r
   *TextModeCount = ARRAY_SIZE (mTerminalConsoleModeData);\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     INT32 Index;\r
     for (Index = 0; Index < *TextModeCount; Index++) {\r
       DEBUG ((DEBUG_INFO, "Terminal - Mode %d, Column = %d, Row = %d\n",\r
               Index, TextModeData[Index].Columns, TextModeData[Index].Rows));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
   return TextModeData;\r
 }\r
 \r
@@ -1380,4 +1380,3 @@ IsHotPlugDevice (
 \r
   return FALSE;\r
 }\r
-\r

diff --git a/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c b/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
index 6a5f4a3b99119e91104063d2d8e42e3516da3c13..dfa680b0359a5034ac066c5a1ba420f32a9f0c32 100644 (file)
--- a/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
+++ b/MdeModulePkg/Universal/SecurityStubDxe/Defer3rdPartyImageLoad.c
@@ -330,7 +330,7 @@ Defer3rdPartyImageLoad (
 \r
   ImageInfo = LookupImage (File, BootPolicy);\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     CHAR16 *DevicePathStr;\r
     DevicePathStr = ConvertDevicePathToText (File, FALSE, FALSE);\r
     DEBUG ((\r
@@ -342,7 +342,7 @@ Defer3rdPartyImageLoad (
     if (DevicePathStr != NULL) {\r
       FreePool (DevicePathStr);\r
     }\r
-    );\r
+  DEBUG_CODE_END ();\r
 \r
   if (mEndOfDxe) {\r
     mImageLoadedAfterEndOfDxe = TRUE;\r

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index 468b73215b654b53e3341e0fb5ebdfe964f87e64..7e4fa60a7890ed65a2862cecbd60cb8745fb35fb 100644 (file)
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -512,7 +512,7 @@ GetHobVariableStore (
   //\r
   // Make sure there is no more than one Variable HOB.\r
   //\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);\r
     if (GuidHob != NULL) {\r
       if ((GetNextGuidHob (&gEfiAuthenticatedVariableGuid, GET_NEXT_HOB (GuidHob)) != NULL)) {\r
@@ -531,7 +531,7 @@ GetHobVariableStore (
         }\r
       }\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);\r
   if (GuidHob != NULL) {\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 5115bcf81696cddf28776482c6b4226bb513e45a..adb3e9720796f93f8913c7ee932ac469a8bc5138 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -280,7 +280,7 @@ RecordVarErrorFlag (
   VAR_ERROR_FLAG            *VarErrFlag;\r
   VAR_ERROR_FLAG            TempFlag;\r
 \r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     DEBUG ((DEBUG_ERROR, "RecordVarErrorFlag (0x%02x) %s:%g - 0x%08x - 0x%x\n", Flag, VariableName, VendorGuid, Attributes, VariableSize));\r
     if (Flag == VAR_ERROR_FLAG_SYSTEM_ERROR) {\r
       if (AtRuntime ()) {\r
@@ -291,7 +291,7 @@ RecordVarErrorFlag (
     } else {\r
       DEBUG ((DEBUG_ERROR, "CommonMaxUserVariableSpace = 0x%x - CommonUserVariableTotalSize = 0x%x\n", mVariableModuleGlobal->CommonMaxUserVariableSpace, mVariableModuleGlobal->CommonUserVariableTotalSize));\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   if (!mEndOfDxe) {\r
     //\r
@@ -3498,7 +3498,7 @@ GetHobVariableStore (
   //\r
   // Make sure there is no more than one Variable HOB.\r
   //\r
-  DEBUG_CODE (\r
+  DEBUG_CODE_BEGIN ();\r
     GuidHob = GetFirstGuidHob (&gEfiAuthenticatedVariableGuid);\r
     if (GuidHob != NULL) {\r
       if ((GetNextGuidHob (&gEfiAuthenticatedVariableGuid, GET_NEXT_HOB (GuidHob)) != NULL)) {\r
@@ -3517,7 +3517,7 @@ GetHobVariableStore (
         }\r
       }\r
     }\r
-  );\r
+  DEBUG_CODE_END ();\r
 \r
   //\r
   // Combinations supported:\r