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.171757.1680819869645128276 for ; Thu, 06 Apr 2023 15:24:29 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=hFNxY1s1; spf=pass (domain: bsdio.com, ip: 66.111.4.29, mailfrom: rebecca@bsdio.com) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id EF2F45C0107; Thu, 6 Apr 2023 18:24:28 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 06 Apr 2023 18:24:28 -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=1680819868; x= 1680906268; bh=rfMWmu1xty+6EWeRnObHcGUs4JISMykCB7tI5/nEju8=; b=h FNxY1s1pkrhVtNBhbw0+XDbMv6ChXOv6D3MF9nBEtxmoOVokvOnl9M9/Z+YLtZoj 6hUOfUTk168N0N4Q5HO9ADCRWFk+yeDMSw6goO4bcuaeMnt/0ghQgWshW0Z6oWF9 INbvxn4GXOVu/o5MhXG4egZiCkCmEcpyKUhDLM0v5p+XEvQeXHO8Smt7hhjGZXzP 7ybhAUJFcBsrwnCBUjuMz4WcBgAUb1KVZI88byMaNeL7dWF0unQ8QtvufA2Y31v4 ZCB5YH5fFoQtKu8eYmMBmO3CRRjEPdjDp4enXUmn07N0ugXpXWuUG96iE2YitttB Rs0NoI71V50lQlHvx6kmA== 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=1680819868; x= 1680906268; bh=rfMWmu1xty+6EWeRnObHcGUs4JISMykCB7tI5/nEju8=; b=E tQIslBn2Qd6Wcyiz5kkDMY9J7DgzJ+zdjQtOf7rM7kj0AlAxFoUYLk2r5B9K9APJ qaCLtdBhi4rmKWytVzUcGLrBJcmHntF4esmhmzurDBt+KGEkMJzvr4KAOODN94Zx WO7Bx+171Q4NWq1U9/I32vgo82nOrT7SqdCGECQvQcHDZyj9XqT3dnB3O75/UM7U poBiVGm6WErxcrh/mb6C0+DBhGexgwN6UNVfIPER3SKeeH/dQasiQed4Hg3+BF8c Woi34f11e0uftHd61KhZk3xChdrZOVyjuK/4zkA9EdR4KLaCWLQnM6Vnuta4uh+P e7yECFqYwb2ZsVI/pvo/w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdejgedgtdejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgepfeenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 6 Apr 2023 18:24:25 -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 15/18] SourceLevelDebugPkg: Update code to be more C11 compliant by using __func__ Date: Thu, 6 Apr 2023 16:23:16 -0600 Message-Id: <20230406222319.2281263-16-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 SourceLevelDebugPkg. 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 --- SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c | 4 ++-- SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c index 4490526273c9..d37fb991f1f2 100644 --- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c +++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.c @@ -186,7 +186,7 @@ Usb3DxeSmmReadyToLockNotify ( { USB3_DEBUG_PORT_HANDLE *Instance; - DEBUG ((DEBUG_INFO, "%a()\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a()\n", __func__)); Instance = GetUsb3DebugPortInstance (); ASSERT (Instance != NULL); @@ -290,7 +290,7 @@ Usb3PciIoNotify ( // // Found the PciIo for USB3 debug port. // - DEBUG ((DEBUG_INFO, "%a()\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a()\n", __func__)); if (Usb3GetIoMmu () != NULL) { Instance = GetUsb3DebugPortInstance (); ASSERT (Instance != NULL); diff --git a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c index 15842a317ef0..aa04442918d2 100644 --- a/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c +++ b/SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.c @@ -35,7 +35,7 @@ Usb3IoMmuPpiNotify ( { USB3_DEBUG_PORT_HANDLE *Instance; - DEBUG ((DEBUG_INFO, "%a()\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a()\n", __func__)); Instance = GetUsb3DebugPortInstance (); ASSERT (Instance != NULL); -- 2.34.1