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.171761.1680819873071261005 for ; Thu, 06 Apr 2023 15:24:33 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@bsdio.com header.s=fm3 header.b=ENGxEpdG; 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 69D625C01D7; Thu, 6 Apr 2023 18:24:32 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Thu, 06 Apr 2023 18:24:32 -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=1680819872; x= 1680906272; bh=fUARmYWQMdrXbaqwWRkIs28iS+rcQztk/NoQ25U+eng=; b=E NGxEpdGu1Caw1dFfk2axfDWDctlsz6rdmYxOG/jQId+sD1W3pbJRjivDWcwbtpQW mxPmlS5S1g3Nhn4uxER7IWxvVooo9EUaKhEnoMPq593cXuvEjPUIuA7zHpc6YtNA OIoamivLYQIPxQJeBQ9jL1Yd8e/+a/l0sJqT/WtEMI7tS7NJXAGCaZ28FDBTkSmj II4bVBsiYHGukE4yEkRKvL8buzai24tYBeEMbhjiuC75q0BuOCduC+Qv9sK5lyGk os6zoM27885C16xX66WEUmuFrUUUnkQnc6hvjdwoBm0J9S52+ho3FUlJugmn5vXd PfCuiW4Em9yUyL2at9/DA== 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=1680819872; x= 1680906272; bh=fUARmYWQMdrXbaqwWRkIs28iS+rcQztk/NoQ25U+eng=; b=l SJ2Js73uOl/RVty1+NNt7zPmV5ohSKpMjgBvoiJBCeSEK1rqAb7ZsX5iNGuJ/JoU tagLz5G0GmH3G1g9qHAVyhS160kNOhtpdtr7vI60UyGpfwslVRGMAYHFdKdB/Vzg kkZpDDd8j18AmIr4Ywprir+n98sUREkvk5dDU3k+miryky1cTmhif2Dbc6RXrj/q OSTSsPHnXA8E7OZLZe+kIAPw47q+aMf2oIXMwo21RcdI8dX3+UKDb70iFQird2ch 0sAuInCGaWk6B+tHLpOv54NCqv7a/SxrqFv+Vp/Wa1v9arVZRH3abddb0+UU1AGC tOsj2e9gkOZvQI6D/NwcQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdejgedgtdekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheptfgvsggv tggtrgcuvehrrghnuceorhgvsggvtggtrgessghsughiohdrtghomheqnecuggftrfgrth htvghrnhepgeffueeuledvgefgvddvgfetvdduhfefkedukeeikedtudekfeetteeifedv leefnecuvehluhhsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomheprh gvsggvtggtrgessghsughiohdrtghomh X-ME-Proxy: Feedback-ID: i5b994698:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 6 Apr 2023 18:24:29 -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 16/18] EmulatorPkg: Update code to be more C11 compliant by using __func__ Date: Thu, 6 Apr 2023 16:23:17 -0600 Message-Id: <20230406222319.2281263-17-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 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 --- EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHostInterfaceLib.c | 2 +- EmulatorPkg/Win/Host/WinPacketFilter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHostInterfaceLib.c b/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHostInterfaceLib.c index 4361bd4170e3..4332caa71016 100644 --- a/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHostInterfaceLib.c +++ b/EmulatorPkg/Library/RedfishPlatformHostInterfaceLib/RedfishPlatformHostInterfaceLib.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