[edk2-devel] [PATCH 17/18] UefiPayloadPkg: Update code to be more C11 compliant by using __func__

[Lu, James]

Reviewed-by: James Lu <james.lu at intel.com>


Thanks,
James

-----Original Message-----
From: Rebecca Cran <rebecca at bsdio.com> 
Sent: Friday, April 7, 2023 6:23 AM
To: devel at edk2.groups.io; Gao, Liming <gaoliming at byosoft.com.cn>; Kinney, Michael D <michael.d.kinney at intel.com>; Jiang, Guomin <guomin.jiang at intel.com>; Xu, Wei6 <wei6.xu at intel.com>; Dong, Guo <guo.dong at intel.com>; Ni, Ray <ray.ni at intel.com>; Rhodes, Sean <sean at starlabs.systems>; Lu, James <james.lu at intel.com>; Guo, Gua <gua.guo at intel.com>; Andrew Fish <afish at apple.com>; Wu, Hao A <hao.a.wu at intel.com>; Maciej Rabeda <maciej.rabeda at linux.intel.com>; Siyuan Fu <siyuan.fu at intel.com>; Yao, Jiewen <jiewen.yao at intel.com>; Wang, Jian J <jian.j.wang at intel.com>; Lu, Xiaoyu1 <xiaoyu1.lu at intel.com>; Ard Biesheuvel <ardb+tianocore at kernel.org>; Sami Mujawar <sami.mujawar at arm.com>; Supreeth Venkatesh <supreeth.venkatesh at arm.com>; Michael Kubacki <mikuback at linux.microsoft.com>; Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Sean Brogan <sean.brogan at microsoft.com>
Cc: Rebecca Cran <rebecca at bsdio.com>; Leif Lindholm <quic_llindhol at quicinc.com>; Abner Chang <abner.chang at amd.com>; Nickle Wang <nicklew at nvidia.com>; Igor Kulchytskyy <igork at ami.com>; Daniel Schaefer <git at danielschaefer.me>; Xu, Min M <min.m.xu at intel.com>; Justen, Jordan L <jordan.l.justen at intel.com>; Gerd Hoffmann <kraxel at redhat.com>; Peter Grehan <grehan at freebsd.org>; Aktas, Erdem <erdemaktas at google.com>; James Bottomley <jejb at linux.ibm.com>; Tom Lendacky <thomas.lendacky at amd.com>; Michael Roth <michael.roth at amd.com>; Sunil V L <sunilvl at ventanamicro.com>; Warkentin, Andrei <andrei.warkentin at intel.com>
Subject: [PATCH 17/18] UefiPayloadPkg: 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 UefiPayloadPkg.

Visual Studio versions before VS 2015 don't support __func__ and so will fail to compile. A workaround is to define __func__ as __FUNCTION__ :

  #define __func__ __FUNCTION__

Signed-off-by: Rebecca Cran <rebecca at bsdio.com>
---
 UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 4 ++--
 UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
index 790e6109c03e..57274754141d 100644
--- a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -135,7 +135,7 @@ InitRootBridge (
                  &mRootBridgeDevicePathTemplate
                  );
   if (DevicePath == NULL) {
-    DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));
+    DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, EFI_OUT_OF_RESOURCES));
     return EFI_OUT_OF_RESOURCES;
   }
 
@@ -145,7 +145,7 @@ InitRootBridge (
   DEBUG ((
     DEBUG_INFO,
     "%a: populated root bus %d, with room for %d subordinate bus(es)\n",
-    __FUNCTION__,
+    __func__,
     RootBusNumber,
     MaxSubBusNumber - RootBusNumber
     ));
diff --git a/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c b/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c
index c66e56aee15a..61a9f01ec9e7 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c
@@ -355,7 +355,7 @@ HandOffToDxeCore (
     DEBUG ((
       DEBUG_INFO,
       "%a() Stack Base: 0x%lx, Stack Size: 0x%x\n",
-      __FUNCTION__,
+      __func__,
       BaseOfStack,
       STACK_SIZE
       ));
--
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102674): https://edk2.groups.io/g/devel/message/102674
Mute This Topic: https://groups.io/mt/98115256/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-