MdeModulePkg: Update code to be more C11 compliant by using __func__

__FUNCTION__ is a pre-standard extension that gcc and Visual C++ among
others support, while __func__ was standardized in C99.

Since it's more standard, replace __FUNCTION__ with __func__ throughout
MdeModulePkg.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

8 files changed, 12 insertions, 12 deletions

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index fb9ae3ce78..cf9d556877 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -1095,7 +1095,7 @@ CoreProcessFvImageFile (
         DEBUG ((

           DEBUG_INFO,

           "%a() FV at 0x%x, FvAlignment required is 0x%x\n",

-          __FUNCTION__,

+          __func__,

           FvHeader,

           FvAlignment

           ));

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 4683016ed7..0e0f9769b9 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -315,7 +315,7 @@ DxeMain (
   DEBUG ((

     DEBUG_INFO,

     "%a: MemoryBaseAddress=0x%Lx MemoryLength=0x%Lx\n",

-    __FUNCTION__,

+    __func__,

     MemoryBaseAddress,

     MemoryLength

     ));

diff --git a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
index b89ab046fa..7cc829b174 100644
--- a/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
+++ b/MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
@@ -838,7 +838,7 @@ InitializeDxeNxMemoryProtectionPolicy (
         DEBUG ((

           DEBUG_INFO,

           "%a: StackBase = 0x%016lx  StackSize = 0x%016lx\n",

-          __FUNCTION__,

+          __func__,

           MemoryHob->AllocDescriptor.MemoryBaseAddress,

           MemoryHob->AllocDescriptor.MemoryLength

           ));

@@ -864,7 +864,7 @@ InitializeDxeNxMemoryProtectionPolicy (
   DEBUG ((

     DEBUG_INFO,

     "%a: applying strict permissions to active memory regions\n",

-    __FUNCTION__

+    __func__

     ));

 

   MergeMemoryMapForProtectionPolicy (MemoryMap, &MemoryMapSize, DescriptorSize);

@@ -926,7 +926,7 @@ InitializeDxeNxMemoryProtectionPolicy (
     DEBUG ((

       DEBUG_INFO,

       "%a: applying strict permissions to inactive memory regions\n",

-      __FUNCTION__

+      __func__

       ));

 

     CoreAcquireGcdMemoryLock ();

diff --git a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
index b8d4184b50..2152833ff6 100644
--- a/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
+++ b/MdeModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c
@@ -1304,7 +1304,7 @@ GetSection (
         DEBUG ((

           DEBUG_ERROR,

           "%a: recursion aborted due to nesting depth\n",

-          __FUNCTION__

+          __func__

           ));

         //

         // Map "aborted" to "not found".

diff --git a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
index fdeaaa39d8..4bc7b749b0 100644
--- a/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/Ia32/DxeLoadFunc.c
@@ -369,7 +369,7 @@ HandOffToDxeCore (
     DEBUG ((

       DEBUG_INFO,

       "%a() Stack Base: 0x%lx, Stack Size: 0x%x\n",

-      __FUNCTION__,

+      __func__,

       BaseOfStack,

       STACK_SIZE

       ));

@@ -457,7 +457,7 @@ HandOffToDxeCore (
     DEBUG ((

       DEBUG_INFO,

       "%a() Stack Base: 0x%lx, Stack Size: 0x%x\n",

-      __FUNCTION__,

+      __func__,

       BaseOfStack,

       STACK_SIZE

       ));

diff --git a/MdeModulePkg/Core/DxeIplPeim/RiscV64/DxeLoadFunc.c b/MdeModulePkg/Core/DxeIplPeim/RiscV64/DxeLoadFunc.c
index f7b57df1c4..b3567d88f7 100644
--- a/MdeModulePkg/Core/DxeIplPeim/RiscV64/DxeLoadFunc.c
+++ b/MdeModulePkg/Core/DxeIplPeim/RiscV64/DxeLoadFunc.c
@@ -36,7 +36,7 @@ HandOffToDxeCore (
   //

   BaseOfStack = AllocatePages (EFI_SIZE_TO_PAGES (STACK_SIZE));

   if (BaseOfStack == NULL) {

-    DEBUG ((DEBUG_ERROR, "%a: Can't allocate memory for stack.", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: Can't allocate memory for stack.", __func__));

     ASSERT (FALSE);

   }

 

@@ -52,7 +52,7 @@ HandOffToDxeCore (
   //

   Status = PeiServicesInstallPpi (&gEndOfPeiSignalPpi);

   if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_ERROR, "%a: Fail to signal End of PEI event.", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: Fail to signal End of PEI event.", __func__));

     ASSERT (FALSE);

   }

 

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 3552feda8f..d8284f9f4f 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -101,7 +101,7 @@ DiscoverPeimsAndOrderWithApriori (
   DEBUG ((

     DEBUG_INFO,

     "%a(): Found 0x%x PEI FFS files in the %dth FV\n",

-    __FUNCTION__,

+    __func__,

     PeimCount,

     Private->CurrentPeimFvCount

     ));

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 60bbe57332..f7cc94c6eb 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -1494,7 +1494,7 @@ ProcessFvFile (
       DEBUG ((

         DEBUG_INFO,

         "%a() FV at 0x%x, FvAlignment required is 0x%x\n",

-        __FUNCTION__,

+        __func__,

         FvHeader,

         FvAlignment

         ));