From ea85f0fe1313a0090f4fa287bb75dbf3a00e0909 Mon Sep 17 00:00:00 2001
From: Michael D Kinney <michael.d.kinney@intel.com>
Date: Sun, 5 Dec 2021 14:33:41 -0800
Subject: [PATCH] ArmVirtPkg: 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: Sami Mujawar <sami.mujawar@arm.com>
---
 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index bb3140f2d6..02d6c87050 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -605,7 +605,7 @@ RemoveStaleFvFileOptions (
     //
     Status = EfiBootManagerDeleteLoadOptionVariable (
                BootOptions[Index].OptionNumber, LoadOptionTypeBoot);
-    DEBUG_CODE (
+    DEBUG_CODE_BEGIN ();
       CHAR16 *DevicePathString;
 
       DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,
@@ -621,7 +621,7 @@ RemoveStaleFvFileOptions (
       if (DevicePathString != NULL) {
         FreePool (DevicePathString);
       }
-      );
+    DEBUG_CODE_END ();
   }
 
   EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);
-- 
2.39.2