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

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni at intel.com>

> -----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 16/18] EmulatorPkg: 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
> EmulatorPkg.
> 
> 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>
> ---
> 
> EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHostI
> nterfaceLib.c | 2 +-
>  EmulatorPkg/Win/Host/WinPacketFilter.c                                                | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git
> a/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHo
> stInterfaceLib.c
> b/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHo
> stInterfaceLib.c
> index 4361bd4170e3..4332caa71016 100644
> ---
> a/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHo
> stInterfaceLib.c
> +++
> b/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHo
> stInterfaceLib.c
> @@ -538,7 +538,7 @@ RedfishPlatformHostInterfaceConstructor (
>    EFI_STATUS  Status;
> 
>    Status = GetRedfishRecordFromVariable (&mRedfishOverIpProtocolData,
> &mRedfishProtocolDataSize);
> -  DEBUG ((DEBUG_INFO, "%a: GetRedfishRecordFromVariable() - %r\n",
> __FUNCTION__, Status));
> +  DEBUG ((DEBUG_INFO, "%a: GetRedfishRecordFromVariable() - %r\n",
> __func__, Status));
>    if (!EFI_ERROR (Status)) {
>      DumpRedfishIpProtocolData (mRedfishOverIpProtocolData,
> mRedfishProtocolDataSize);
>    }
> diff --git a/EmulatorPkg/Win/Host/WinPacketFilter.c
> b/EmulatorPkg/Win/Host/WinPacketFilter.c
> index 21859897c85f..a71c7e8c131b 100644
> --- a/EmulatorPkg/Win/Host/WinPacketFilter.c
> +++ b/EmulatorPkg/Win/Host/WinPacketFilter.c
> @@ -966,7 +966,7 @@ WintNtInitializeNetUtilityData (
>      goto ErrorReturn;
>    }
> 
> -  DEBUG ((DEBUG_INFO, "%a, total %d interface(s) found\n",
> __FUNCTION__, InterfaceCount));
> +  DEBUG ((DEBUG_INFO, "%a, total %d interface(s) found\n", __func__,
> InterfaceCount));
>    //
>    // Active interface index is set to first interface if given instance does
>    // not exist.
> --
> 2.34.1



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