From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by mx.groups.io with SMTP id smtpd.web11.171734.1680819824601874879 for ; Thu, 06 Apr 2023 15:23:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=a8YAAhH4; spf=pass (domain: bsdio.com, ip: 66.111.4.29, mailfrom: rebecca@bsdio.com) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E58655C01E1; Thu, 6 Apr 2023 18:23:43 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 06 Apr 2023 18:23:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdio.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm3; t=1680819823; x= 1680906223; bh=wgEAsAWbXJ66HJJxoJ/ittpG3+gXEyv+X4XvyrhfWEU=; b=a 8YAAhH4hBTfVuvl/lUt7vEgbJc1r6z5hYT+X+69aeuV74FqVVAYzxCOL5zSaRDuD SEsEGxJqMxbwFrm2c9l0FD8VqXxF1qCSL7SjWI7s1q5nQxTaOMnLy38V1pniLQfp 20wTGmgCKdStTlDpNN4C3+G+8PYz1VwiM9Eruf5EiCYH2a/pCR8ohJMhCvytcCig Cx8CtiG2xxggfqBS+V1z1u675JHn5bvPfWT9vRYNoGcQicIgFmxwscvbBorS9DqY 86pdhzOjE/BL4A/XdSZrRlsYTlzweP6DOZ20Z06mC1/AdqqZzDYg8wDqXDqJmkyh JJpj0UrB9ln5B1Y/A03lw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1680819823; x= 1680906223; bh=wgEAsAWbXJ66HJJxoJ/ittpG3+gXEyv+X4XvyrhfWEU=; b=R fgtYCnYjVoOU5n2seLOXOSL3NTXbt0lhHo+Mj37gK+mANCHXthC01ifpoT9oBnbC n79Jux/OtmHumNQyrChayT0TTwbablZ71UVOrYdnRaK7CtlP8Lw/hzT95QJPoNqz KVnHkpCBXN2wkRuO2GTXBKBkp1NnFfXWmQoRxDPX4az718cate4VgyVVPMOs3Rpr gsb9+/gzl7auV/K9K1q/TNqK6F/0LO0XyHPEvl6NgosxGzWEs8azAwujGt6SHANf KF5m814E+dRIvRXkxQZuJC/5Znkch1CcL2bFYfV+k8S6fkx+vaOjUZEFx1JO0IkK 6oRlrgZDvAwerLfrxdDHA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdejgedgtdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 6 Apr 2023 18:23:40 -0400 (EDT) From: "Rebecca Cran" To: devel@edk2.groups.io, Liming Gao , Michael D Kinney , Guomin Jiang , Wei6 Xu , Guo Dong , Ray Ni , Sean Rhodes , James Lu , Gua Guo , Andrew Fish , Hao A Wu , Maciej Rabeda , Siyuan Fu , Jiewen Yao , Jian J Wang , Xiaoyu Lu , Ard Biesheuvel , Sami Mujawar , Supreeth Venkatesh , Michael Kubacki , Nate DeSimone , Sean Brogan Cc: Rebecca Cran , Leif Lindholm , Abner Chang , Nickle Wang , Igor Kulchytskyy , Daniel Schaefer , Min Xu , Jordan Justen , Gerd Hoffmann , Peter Grehan , Erdem Aktas , James Bottomley , Tom Lendacky , Michael Roth , Sunil V L , Andrei Warkentin Subject: [PATCH 02/18] ArmVirtPkg: Update code to be more C11 compliant by using __func__ Date: Thu, 6 Apr 2023 16:23:03 -0600 Message-Id: <20230406222319.2281263-3-rebecca@bsdio.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230406222319.2281263-1-rebecca@bsdio.com> References: <20230406222319.2281263-1-rebecca@bsdio.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit __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 ArmVirtPkg. 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 --- ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpi.c | 4 ++-- ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c | 2 +- ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c | 4 ++-- ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c | 6 +++--- ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c | 6 +++--- ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c | 10 +++++----- ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c | 4 ++-- ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c | 2 +- ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c | 4 ++-- ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c | 2 +- ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 20 ++++++++++---------- ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c | 2 +- ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c | 6 +++--- ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c | 4 ++-- ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c | 4 ++-- ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c | 4 ++-- ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c | 4 ++-- 17 files changed, 44 insertions(+), 44 deletions(-) diff --git a/ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpi.c b/ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpi.c index 0595b0e1d384..254aa978c67a 100644 --- a/ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpi.c +++ b/ArmVirtPkg/CloudHvAcpiPlatformDxe/CloudHvAcpi.c @@ -106,7 +106,7 @@ InstallCloudHvAcpiTables ( } // while if (DsdtPtr == NULL) { - DEBUG ((DEBUG_ERROR, "%a: no DSDT found\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: no DSDT found\n", __func__)); return EFI_NOT_FOUND; } @@ -151,7 +151,7 @@ CloudHvAcpiPlatformEntryPoint ( DEBUG (( DEBUG_ERROR, "%a: Fail to install Acpi table: %r\n", - __FUNCTION__, + __func__, Status )); CpuDeadLoop (); diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c index 57bbfd20d03c..cf9434e534b5 100644 --- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c +++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c @@ -150,7 +150,7 @@ ArmVirtGicArchLibConstructor ( break; default: - DEBUG ((DEBUG_ERROR, "%a: No GIC revision specified!\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: No GIC revision specified!\n", __func__)); return RETURN_NOT_FOUND; } diff --git a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c index 45dd9f179c6a..01bcd58d30e9 100644 --- a/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c +++ b/ArmVirtPkg/Library/ArmVirtPL031FdtClientLib/ArmVirtPL031FdtClientLib.c @@ -42,7 +42,7 @@ ArmVirtPL031FdtClientLibConstructor ( DEBUG (( DEBUG_WARN, "%a: No 'arm,pl031' compatible DT node found\n", - __FUNCTION__ + __func__ )); return EFI_SUCCESS; } @@ -58,7 +58,7 @@ ArmVirtPL031FdtClientLibConstructor ( DEBUG (( DEBUG_WARN, "%a: No 'reg' property found in 'arm,pl031' compatible DT node\n", - __FUNCTION__ + __func__ )); return EFI_SUCCESS; } diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c index c7065b7ec5c1..1f27b7648d16 100644 --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemLib/ArmVirtPsciResetSystemLib.c @@ -65,7 +65,7 @@ ArmPsciResetSystemLibConstructor ( DEBUG (( DEBUG_ERROR, "%a: Unknown PSCI method \"%a\"\n", - __FUNCTION__, + __func__, Prop )); return EFI_NOT_FOUND; @@ -105,7 +105,7 @@ ResetCold ( break; default: - DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__)); } } @@ -154,7 +154,7 @@ ResetShutdown ( break; default: - DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__)); } } diff --git a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c index 03d14fe4325d..dffc1fb9790b 100644 --- a/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c +++ b/ArmVirtPkg/Library/ArmVirtPsciResetSystemPeiLib/ArmVirtPsciResetSystemPeiLib.c @@ -73,7 +73,7 @@ DiscoverPsciMethod ( DEBUG (( DEBUG_ERROR, "%a: Missing PSCI method property\n", - __FUNCTION__ + __func__ )); return PsciMethodUnknown; } @@ -86,7 +86,7 @@ DiscoverPsciMethod ( DEBUG (( DEBUG_ERROR, "%a: Unknown PSCI method \"%a\"\n", - __FUNCTION__, + __func__, Prop )); return PsciMethodUnknown; @@ -119,7 +119,7 @@ PerformPsciAction ( break; default: - DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: no PSCI method defined\n", __func__)); ASSERT (FALSE); } } diff --git a/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c b/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c index 28a0c0b0785f..98cc13870599 100644 --- a/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/CloudHvVirtMemInfoLib/CloudHvVirtMemInfoLib.c @@ -98,7 +98,7 @@ CloudHvVirtMemInfoPeiLibConstructor ( DEBUG (( DEBUG_INFO, "%a: System RAM @ 0x%lx - 0x%lx\n", - __FUNCTION__, + __func__, CurBase, CurBase + CurSize - 1 )); @@ -124,7 +124,7 @@ CloudHvVirtMemInfoPeiLibConstructor ( DEBUG (( DEBUG_WARN, "%a: memory node larger than %d will not be included into Memory System\n", - __FUNCTION__, + __func__, CLOUDHV_MAX_MEM_NODE_NUM )); break; @@ -133,7 +133,7 @@ CloudHvVirtMemInfoPeiLibConstructor ( DEBUG (( DEBUG_ERROR, "%a: Failed to parse FDT memory node\n", - __FUNCTION__ + __func__ )); } } @@ -186,7 +186,7 @@ ArmVirtGetMemoryMap ( ); if (VirtualMemoryTable == NULL) { - DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __func__)); return; } @@ -205,7 +205,7 @@ ArmVirtGetMemoryMap ( "\tPhysicalBase: 0x%lX\n" "\tVirtualBase: 0x%lX\n" "\tLength: 0x%lX\n", - __FUNCTION__, + __func__, MemNodeIndex, VirtualMemoryTable[Index].PhysicalBase, VirtualMemoryTable[Index].VirtualBase, diff --git a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c index 89eee757d141..e8d3576a71cf 100644 --- a/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c +++ b/ArmVirtPkg/Library/KvmtoolRtcFdtClientLib/KvmtoolRtcFdtClientLib.c @@ -147,7 +147,7 @@ KvmtoolRtcFdtClientLibConstructor ( DEBUG (( DEBUG_ERROR, "%a: No 'motorola,mc146818' compatible DT node found\n", - __FUNCTION__ + __func__ )); return Status; } @@ -163,7 +163,7 @@ KvmtoolRtcFdtClientLibConstructor ( DEBUG (( DEBUG_ERROR, "%a: No 'reg' property found in 'motorola,mc146818' compatible DT node\n", - __FUNCTION__ + __func__ )); return Status; } diff --git a/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c b/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c index 29122856b6e8..79412897f225 100644 --- a/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/KvmtoolVirtMemInfoLib/KvmtoolVirtMemInfoLib.c @@ -54,7 +54,7 @@ ArmVirtGetMemoryMap ( DEBUG (( DEBUG_ERROR, "%a: Error: Failed to Allocate Pages\n", - __FUNCTION__ + __func__ )); return; } diff --git a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c index 129c16b7110c..43f5858644b1 100644 --- a/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c +++ b/ArmVirtPkg/Library/NorFlashKvmtoolLib/NorFlashKvmtool.c @@ -265,7 +265,7 @@ NorFlashPlatformLibConstructor ( DEBUG (( DEBUG_ERROR, "%a: GetNodeProperty ('label') failed (Status == %r)\n", - __FUNCTION__, + __func__, Status )); } else if (AsciiStrCmp (Label, LABEL_UEFI_VAR_STORE) == 0) { @@ -284,7 +284,7 @@ NorFlashPlatformLibConstructor ( DEBUG (( DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n", - __FUNCTION__, + __func__, Status )); continue; diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c index 55bce88bc8dd..d0fa7e5046c9 100644 --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c @@ -75,7 +75,7 @@ VirtNorFlashPlatformGetDevices ( DEBUG (( DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n", - __FUNCTION__, + __func__, Status )); continue; diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c index 3ad1ecd9d286..10c815378cd5 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c @@ -190,7 +190,7 @@ FilterAndProcess ( DEBUG (( DEBUG_VERBOSE, "%a: %g: %r\n", - __FUNCTION__, + __func__, ProtocolGuid, Status )); @@ -261,7 +261,7 @@ IsPciDisplay ( &Pci ); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status)); + DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __func__, ReportText, Status)); return FALSE; } @@ -410,7 +410,7 @@ IsVirtioPciRng ( return FALSE; PciError: - DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __FUNCTION__, ReportText, Status)); + DEBUG ((DEBUG_ERROR, "%a: %s: %r\n", __func__, ReportText, Status)); return FALSE; } @@ -437,7 +437,7 @@ Connect ( DEBUG (( EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE, "%a: %s: %r\n", - __FUNCTION__, + __func__, ReportText, Status )); @@ -463,7 +463,7 @@ AddOutput ( DEBUG (( DEBUG_ERROR, "%a: %s: handle %p: device path not found\n", - __FUNCTION__, + __func__, ReportText, Handle )); @@ -475,7 +475,7 @@ AddOutput ( DEBUG (( DEBUG_ERROR, "%a: %s: adding to ConOut: %r\n", - __FUNCTION__, + __func__, ReportText, Status )); @@ -487,7 +487,7 @@ AddOutput ( DEBUG (( DEBUG_ERROR, "%a: %s: adding to ErrOut: %r\n", - __FUNCTION__, + __func__, ReportText, Status )); @@ -497,7 +497,7 @@ AddOutput ( DEBUG (( DEBUG_VERBOSE, "%a: %s: added to ConOut and ErrOut\n", - __FUNCTION__, + __func__, ReportText )); } @@ -698,7 +698,7 @@ RemoveStaleFvFileOptions ( DEBUG (( EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE, "%a: removing stale Boot#%04x %s: %r\n", - __FUNCTION__, + __func__, (UINT32)BootOptions[Index].OptionNumber, DevicePathString == NULL ? L"" : DevicePathString, Status @@ -878,7 +878,7 @@ PlatformBootManagerBeforeConsole ( DEBUG (( EFI_ERROR (Status) ? DEBUG_ERROR : DEBUG_VERBOSE, "%a: SetVariable(%s, %u): %r\n", - __FUNCTION__, + __func__, EFI_TIME_OUT_VARIABLE_NAME, FrontPageTimeout, Status diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c b/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c index c66b7c7b21fc..7dc59ae14d90 100644 --- a/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c +++ b/ArmVirtPkg/Library/PlatformBootManagerLib/QemuKernel.c @@ -66,7 +66,7 @@ TryRunningQemuKernel ( DEBUG (( DEBUG_ERROR, "%a: QemuStartKernelImage(): %r\n", - __FUNCTION__, + __func__, Status )); } diff --git a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c index bb71fee64920..8d9dcf504dc6 100644 --- a/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c +++ b/ArmVirtPkg/Library/PlatformPeiLib/PlatformPeiLib.c @@ -111,7 +111,7 @@ PlatformPeim ( UartBase = fdt64_to_cpu (ReadUnaligned64 (RegProp)); - DEBUG ((DEBUG_INFO, "%a: PL011 UART @ 0x%lx\n", __FUNCTION__, UartBase)); + DEBUG ((DEBUG_INFO, "%a: PL011 UART @ 0x%lx\n", __func__, UartBase)); *UartHobData = UartBase; break; @@ -148,7 +148,7 @@ PlatformPeim ( DEBUG (( DEBUG_WARN, "%a: 'ranges' property has unexpected size %d\n", - __FUNCTION__, + __func__, RangesLen )); break; @@ -175,7 +175,7 @@ PlatformPeim ( if (FeaturePcdGet (PcdTpm2SupportEnabled)) { if (TpmBase != 0) { - DEBUG ((DEBUG_INFO, "%a: TPM @ 0x%lx\n", __FUNCTION__, TpmBase)); + DEBUG ((DEBUG_INFO, "%a: TPM @ 0x%lx\n", __func__, TpmBase)); Status = (EFI_STATUS)PcdSet64S (PcdTpmBaseAddress, TpmBase); ASSERT_EFI_ERROR (Status); diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c index 9cf43f06c073..23bd0fe68ef7 100644 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoLib.c @@ -83,7 +83,7 @@ ArmVirtGetMemoryMap ( ); if (VirtualMemoryTable == NULL) { - DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: Error: Failed AllocatePool()\n", __func__)); return; } @@ -99,7 +99,7 @@ ArmVirtGetMemoryMap ( "\tPhysicalBase: 0x%lX\n" "\tVirtualBase: 0x%lX\n" "\tLength: 0x%lX\n", - __FUNCTION__, + __func__, VirtualMemoryTable[0].PhysicalBase, VirtualMemoryTable[0].VirtualBase, VirtualMemoryTable[0].Length diff --git a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c index c47ab8296622..1bcc2e26aa60 100644 --- a/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c +++ b/ArmVirtPkg/Library/QemuVirtMemInfoLib/QemuVirtMemInfoPeiLibConstructor.c @@ -64,7 +64,7 @@ QemuVirtMemInfoPeiLibConstructor ( DEBUG (( DEBUG_INFO, "%a: System RAM @ 0x%lx - 0x%lx\n", - __FUNCTION__, + __func__, CurBase, CurBase + CurSize - 1 )); @@ -77,7 +77,7 @@ QemuVirtMemInfoPeiLibConstructor ( DEBUG (( DEBUG_ERROR, "%a: Failed to parse FDT memory node\n", - __FUNCTION__ + __func__ )); } } diff --git a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c index 96bc442f6912..32c8b1e94ed2 100644 --- a/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c +++ b/ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.c @@ -68,7 +68,7 @@ GetXenArmAcpiRsdp ( DEBUG (( DEBUG_WARN, "%a: No 'xen,guest-acpi' compatible DT node found\n", - __FUNCTION__ + __func__ )); return EFI_NOT_FOUND; } @@ -140,7 +140,7 @@ InstallXenArmTables ( // Status = GetXenArmAcpiRsdp (&XenAcpiRsdpStructurePtr); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_INFO, "%a: No RSDP table found\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: No RSDP table found\n", __func__)); return Status; } diff --git a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c index 23d504cc64da..f626c455c411 100644 --- a/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c +++ b/ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.c @@ -49,7 +49,7 @@ InitializeXenioFdtDxe ( DEBUG (( DEBUG_WARN, "%a: No 'xen,xen' compatible DT node found\n", - __FUNCTION__ + __func__ )); return EFI_UNSUPPORTED; } @@ -70,7 +70,7 @@ InitializeXenioFdtDxe ( DEBUG_ERROR, "%a: XenIoMmioInstall () failed on a new handle " "(Status == %r)\n", - __FUNCTION__, + __func__, Status )); return Status; -- 2.34.1