From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.34431.1681088750941877632 for ; Sun, 09 Apr 2023 18:05:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=VgqrJs4W; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: wei6.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1681088750; x=1712624750; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=gZP8N9XVWvs3sCq2c+JqC1VLrXNobfjndN+2oA9z7mw=; b=VgqrJs4WVFAJDNTPMaXefhUCDrLXWm4XoAP1dnPOAVJ8HK/Ctne6YPnB TYg9ko0pTajtVGuBCgsuhKHzVLlGN1sPliRPGiZRmZ2PHUSh5OImA86yh 3bt48AYqqDRwfv6VbuLWZtnckbsrkD0ZSnl2ROchUJDCD/wyw8M+0X6bw 2EH8wnWdb2k67JXf9PIO1MetzmqjfDC0OR3xnqT3fiNJjegkPzm6T/viD 6hz8ueOmpjIujc24HkSjkGcAbXm64xmMseQccIwU2eVvdekkKBixHvaea 1f5OyiWUhMRHFikBQlr8mbzRkrHOLyuBs3UU8KQCOQ0KXBQ4p8xWpJi6T g==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="345043618" X-IronPort-AV: E=Sophos;i="5.98,332,1673942400"; d="scan'208";a="345043618" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2023 18:05:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="665467663" X-IronPort-AV: E=Sophos;i="5.98,332,1673942400"; d="scan'208";a="665467663" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga006.jf.intel.com with ESMTP; 09 Apr 2023 18:05:49 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sun, 9 Apr 2023 18:05:48 -0700 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sun, 9 Apr 2023 18:05:47 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Sun, 9 Apr 2023 18:05:47 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Sun, 9 Apr 2023 18:05:47 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NTlirVKKUuuGPr15Ha+QWyRKWMcf2fugWaktFy4Z4ZvDTHtbem8aP0m0yecTrQ9r0Ga3d1JGFt9hEaMDDKCYS7trE++uSCx2swoTgK2U3EcokZuIhuomyEoYvIrHDBl/IiLliN7V51W1tqHQ+9iIShdxjCotTJd3jJm7nXXNlaIpW4yGUXu+nXQWPYcC0T4f6rZeOHCfYi4m+dShX0zbxpbxw4WioyDrXxhfW9b0k6JBPhGVxlEig1KHjvQbBRgeTA3qfXSWZUmxnwsUzfCDXuPDSsK8+Vkt8Ggo7EDhzGqbuavb6alXAl+AQsu95xdMMNHM0W62ESbMrzAXxrGOeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=boQyQs6f9ui59GQBpjXsMRiD31lV3WtBWLm71vuUF1g=; b=iu3mSODiWpPCoxoMOnPjpcSHPHvQdeHuwlSxKdki8Ka+8ohXY5YElgTOn3vZjVyjz+CGBr+8wM2qcDZ/YslCHxIzgRfmI7sKQ4ba6fF6Xt3uUKRS0QzQ2OiFVMpb/x2cuz0yjY/mS/kYKr44xS4kI4a63GwkLYSBehgKko1J2S7bPeDP+54acD7174ZYBBzMVxe9W6qyTbuyv6oFL6lXL5lJbsQYB1MnIzHRyi/HA+dud6moZsMWvMmdO+lUv7ytvM+bx291xFZfslRR0fQIYjOJAT0NosDhIukQBlFRZZQvKp+ld0+/iR9PCdWmi8LWXhUNQEj6EN+cJKZ+fJUgwg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BYAPR11MB2712.namprd11.prod.outlook.com (2603:10b6:a02:bf::13) by SN7PR11MB7116.namprd11.prod.outlook.com (2603:10b6:806:29b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.35; Mon, 10 Apr 2023 01:05:43 +0000 Received: from BYAPR11MB2712.namprd11.prod.outlook.com ([fe80::e1d7:bdc1:8682:e7b9]) by BYAPR11MB2712.namprd11.prod.outlook.com ([fe80::e1d7:bdc1:8682:e7b9%2]) with mapi id 15.20.6277.038; Mon, 10 Apr 2023 01:05:43 +0000 From: "Xu, Wei6" To: Rebecca Cran , "devel@edk2.groups.io" , "Gao, Liming" , "Kinney, Michael D" , "Jiang, Guomin" , "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Lu, James" , "Guo, Gua" , Andrew Fish , "Wu, Hao A" , Maciej Rabeda , Siyuan Fu , "Yao, Jiewen" , "Wang, Jian J" , "Lu, Xiaoyu1" , Ard Biesheuvel , Sami Mujawar , Supreeth Venkatesh , Michael Kubacki , "Desimone, Nathaniel L" , Sean Brogan CC: Leif Lindholm , Abner Chang , Nickle Wang , Igor Kulchytskyy , Daniel Schaefer , "Xu, Min M" , "Justen, Jordan L" , "Gerd Hoffmann" , Peter Grehan , "Aktas, Erdem" , James Bottomley , "Tom Lendacky" , Michael Roth , Sunil V L , "Warkentin, Andrei" Subject: Re: [PATCH 18/18] FmpDevicePkg: Update code to be more C11 compliant by using __func__ Thread-Topic: [PATCH 18/18] FmpDevicePkg: Update code to be more C11 compliant by using __func__ Thread-Index: AQHZaNabMJK5skrU3kK9DNuKTdQh8a8jvqyg Date: Mon, 10 Apr 2023 01:05:42 +0000 Message-ID: References: <20230406222319.2281263-1-rebecca@bsdio.com> <20230406222319.2281263-19-rebecca@bsdio.com> In-Reply-To: <20230406222319.2281263-19-rebecca@bsdio.com> Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BYAPR11MB2712:EE_|SN7PR11MB7116:EE_ x-ms-office365-filtering-correlation-id: d0baa22d-d43b-43d0-54bc-08db395fb559 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: l66r5T3t28TZ7my3p8ajXs2Je8OJuU/sqtny84yKCZItPHTqBuI0aIp5JnMQ+KX1JRP5FCcgHGgfTyWp8TCm3szBoNDiwcxb8y/AZTI8uQUI3vXiX37l7vEV47Cm1exj+Qad75OubHrD04yOtu/m6gD+t3fkmR54spDei0Efr9Q5qCLroKhjw7+UULU05bzcCr8WbnGMz355QM2oVwfz1bbFi/6qvUM+zO9tLGEXCsiVNT3N3Mqv+NP3ZJlE99lWCJZy2w5+cR8jSMuFVcTYvs0VDxrBtuEBMQUXwqerHro1QxiFszCfAXZzBKNYD5uBnBeqp1PeuT9m/vce1+WhWD4oMEqCoDhqOM6itZYcwl3QHAv60oUGKa2XW/6Gui8CB1px1+CGQimL96umT40J2YGaN/64zg+e875e4BnGW9t5FLsCjh1d1xXh/GKVnibDE5mpetbLhBD2uPi6JNasT0XqgYmtKZWdVUkXv0Eh3KBEdLM+R0iC2/pz/7ix0jpAyXqhXRnnZK4FNedreW+Wa5DJkwbJqW9O3+ZEoLzkt8hDMtWxfNu4j4YlvQBdR519NQ9bhzQHzB4w7CHMjhaK+f17MY19yM8cfeR7NbrmFRAIOLYcirV93dBpp8K4NQ8nlddhrucYUi6Pol7OlVsOdQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB2712.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(136003)(39860400002)(366004)(396003)(346002)(451199021)(9686003)(71200400001)(33656002)(82960400001)(38070700005)(7696005)(55016003)(186003)(83380400001)(921005)(38100700002)(122000001)(6506007)(53546011)(76116006)(66556008)(41300700001)(4326008)(64756008)(66476007)(15650500001)(66446008)(66946007)(54906003)(110136005)(2906002)(8676002)(316002)(52536014)(8936002)(5660300002)(86362001)(7416002)(478600001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?xJsK9FrQfjFA0W4RCwMaPuH0dPr5HU7n35KnPfwdUfLBCgsuKoalncCCztX1?= =?us-ascii?Q?p97poJhIqsHpnApLX37TL0/xvjXBDlIxZ9osFcokeXd0dHWyZzn9acdTrFzL?= =?us-ascii?Q?c6EM31ri7X2+CNrn5NzS57OkBp446VG2yDCZSPTnoouucxEicHo2kST50Yzw?= =?us-ascii?Q?jVUM7PNF8guTSWVHFWZhVql0YQNwO4mMjxMVoxQBmuZudUopclfSGGmgNx6K?= =?us-ascii?Q?6GdTUAm6egwVmn8HXSgXsvtbGT+gbQF+DxNTy+mmdfIVPoXfcn7xeYvucY/j?= =?us-ascii?Q?N0P6J0PWny/W2KoZCUAbPWMj9yErVAXil7RthZD4L2HVcNtn6xVlxm99OPIv?= =?us-ascii?Q?/AUNwP6Db+bmo/sNit3mkMep/fn8tf6cInAApYQ3pKMPD2FVIRzh1mXVcMTQ?= =?us-ascii?Q?tG87NZoBrM3t95u6wUBuRNIHx/7RMY1Vmnb+Fs55pi0M2R0gd3gnuVdnn+uC?= =?us-ascii?Q?wJAnV943R2cjKo9yfcAesFuEYWluRFzOC4Y5gn14JMIezZInwQzvNKREI+9q?= =?us-ascii?Q?HakF/HXncU7NwVQd0IVdPfJVrJlkyIZIPICa2C1PBdz3+BPehNUV3aNMFThP?= =?us-ascii?Q?wXnzDsqsuOMOUDy721A17B7uEcUORFh8G0fjnM/CVcWOUjQ+T+lLnzky3hbT?= =?us-ascii?Q?KWzhSOnkGmvsLAkhpnsHhxyxLCjH2EpyUDAhFXnGi75JvNWMfY5gEj41x8ZJ?= =?us-ascii?Q?qkCAmSvwVDZJXfMK8e1hW8CI09FbYNNlHKjp2bJtAPlNqPf1S+TqFtRKwYMi?= =?us-ascii?Q?/1plwO6CvtUWnrIoezefwV7vkavhuB6RI5Ll3KGr3zQ0+URo0Fmk13YNejha?= =?us-ascii?Q?9PmbDCNbnFku3Sl50cq5qeGGNZQd3xRlVE87YG+iwFnVudw6t9U4Kd5bd9lz?= =?us-ascii?Q?1+wX8SG2rekk2G1DHJdLqK1DXTODl80oz8dzZCVHySWrcGujuyR0rox0cav7?= =?us-ascii?Q?DL0yTR40p3Tqvy8bPs6JdE/MPQ5IcwHccdj+oowUVq1JInCqmq29w7GSbGhc?= =?us-ascii?Q?e9OHTYb/wVrt9JYKDYg26K50YkJVZOgjjwX+INK+cuDf3e7SscWTe4MB2nVa?= =?us-ascii?Q?fAC2tagQg91ejRfTCLwPe8GuUpbGKXI7C9B13lxPvuEPt+9s4af27EKjBOqc?= =?us-ascii?Q?Et07q5mHGzyAX2pOujRsdK926z4bl94T94depBA6lbSkLBwCJFqrt8FS5KKE?= =?us-ascii?Q?o179GqJEWG8BSj1bBDhsF+Awgv+JOoJotWH2eU447YY1pNWzlPTnzTJdmFqV?= =?us-ascii?Q?HT3z/yF+CG4QXSuIgWiv56GOHOmWRn0v2clcuiIbQ7a8tKCLYTe7OAzLw9YS?= =?us-ascii?Q?L1DddPnWTYPtXtLIzAEonzux9ecDXQgQCdyMxV7n1RyIiD+aM7hO5U9ED94e?= =?us-ascii?Q?Iv1F6N8wAxezl5uZU6thJ0hROmVP2Ea4IoGu7eAajeGmdCoA1zS0+C4Dayx5?= =?us-ascii?Q?t1KmbWgde5fLtuvoXc8sVlqJC8mxWPq3plfSkTXBtjsRCJtxv8utMqTGgLzz?= =?us-ascii?Q?P8257E0VUi4QnBKgI0/SKPX6dlKOGIVFFAFsVV9hAYjRvjKWIlKjX+7ylg?= =?us-ascii?Q?=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2712.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0baa22d-d43b-43d0-54bc-08db395fb559 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2023 01:05:43.0121 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: gwAFLBV1VMisnC7bkib2qBBqm/MwVmHDr/ZKsh+xlAkJ+u0YqqP4nVpH9i1ReKLlgUxbIQEEqq8QIha1Am2fNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7116 Return-Path: wei6.xu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wei6 Xu Thanks, Wei -----Original Message----- From: Rebecca Cran =20 Sent: Friday, April 7, 2023 6:23 AM To: devel@edk2.groups.io; Gao, Liming ; Kinney, M= ichael D ; Jiang, Guomin ; Xu, Wei6 ; Dong, Guo ; Ni, Ray <= ray.ni@intel.com>; Rhodes, Sean ; Lu, James ; Guo, Gua ; Andrew Fish ; = Wu, Hao A ; Maciej Rabeda ; Siyuan Fu ; Yao, Jiewen ; Wa= ng, Jian J ; Lu, Xiaoyu1 ; Ard= Biesheuvel ; Sami Mujawar ; Supreeth Venkatesh ; Michael Kubacki ; Desimone, Nathaniel L ; Sean Brogan Cc: Rebecca Cran ; Leif Lindholm ; Abner Chang ; Nickle Wang ; = Igor Kulchytskyy ; Daniel Schaefer ; = Xu, Min M ; Justen, Jordan L ; Gerd Hoffmann ; Peter Grehan ; Ak= tas, Erdem ; James Bottomley ; T= om Lendacky ; Michael Roth ;= Sunil V L ; Warkentin, Andrei Subject: [PATCH 18/18] FmpDevicePkg: Update code to be more C11 compliant b= y using __func__ __FUNCTION__ is a pre-standard extension that gcc and Visual C++ among othe= rs support, while __func__ was standardized in C99. Since it's more standard, replace __FUNCTION__ with __func__ throughout Fmp= DevicePkg. Visual Studio versions before VS 2015 don't support __func__ and so will fa= il to compile. A workaround is to define __func__ as __FUNCTION__ : #define __func__ __FUNCTION__ Signed-off-by: Rebecca Cran --- FmpDevicePkg/FmpDxe/VariableSupport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FmpDevicePkg/FmpDxe/VariableSupport.c b/FmpDevicePkg/FmpDxe/Va= riableSupport.c index 541e5e0f5fc7..5126c5e2d556 100644 --- a/FmpDevicePkg/FmpDxe/VariableSupport.c +++ b/FmpDevicePkg/FmpDxe/VariableSupport.c @@ -832,7 +832,7 @@ LockAllFmpVariables ( // Locate the VariablePolicy protocol. Status =3D gBS->LocateProtocol (&gEdkiiVariablePolicyProtocolGuid, NULL,= (VOID **)&VariablePolicy); if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "FmpDxe %a - Could not locate VariablePolicy prot= ocol! %r\n", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "FmpDxe %a - Could not locate VariablePolicy=20 + protocol! %r\n", __func__, Status)); return Status; } =20 -- 2.34.1