From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 1AC0BD80056 for ; Tue, 23 Jan 2024 23:27:07 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=5KP7CyxpSMk9XGFwYXgufx4nAyh7MwK3yX30vrm+KPA=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1706052426; v=1; b=LLfrJlFa2nZThi/gul/1KwLbzTWLF1RHI45ZuARA2Ev1z/AGkL6+JmQHEnFZvQ7EBoBcW/MO VKqp3t1qYcXG/Jep8Hq/V2GFZPd1EdeFsajwE3QQ7G+csNvdtY2ewKepUOxLWt8u84nyKdHAFfK zEymAepigzjsw5mBnEwKHbN0= X-Received: by 127.0.0.2 with SMTP id YwW1YY7687511xqYgHLSl49r; Tue, 23 Jan 2024 15:27:06 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by mx.groups.io with SMTP id smtpd.web11.9658.1706052426009379806 for ; Tue, 23 Jan 2024 15:27:06 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="8799790" X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="8799790" X-Received: from orviesa005.jf.intel.com ([10.64.159.145]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2024 15:27:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="1693013" X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orviesa005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 23 Jan 2024 15:27:05 -0800 X-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.35; Tue, 23 Jan 2024 15:27:04 -0800 X-Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) 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.35 via Frontend Transport; Tue, 23 Jan 2024 15:27:04 -0800 X-Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.41) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 23 Jan 2024 15:27:04 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RzUI0hVu2ZKe0Hhk3LqfIEGg1M0liILgz550sDHRNicpLkPwy3qOA/iGn6pUjZEak+8W4QWFI6gPKy5mYzVxmi++XQj6kbP3B2mbr7ENKbpt+nT7Y0m64x4FVh4pplIr3jCMzYN11UvEdj+FosmvMvHHVupxH6VkCtp4WuyOrbmo2i1bBy3jwSIBtwI4eK+ZlcoDT7y+EBvHcNeVmfdLjbxYRsLxLcYF9lwbMxx2eaEbeG97RCHSfORbCD7Cp4+mtjK5hd9HzgdSv74TnPDpChfUTO24u1ManxFxY2DEaj3Bw0ubBdRqN5JPAalcp+yC80EGNTOqKZoxwaW1NDQMBw== 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=91ytqAHjnJEUoX6XAIZfhoh3OKI7VoOxTnl8aZNrDGY=; b=iUbmMpAJ6AiZZRmJEELkwd2Ioaj1LlkExHyZpuyfjMhrEAC+6m02t3ZH41G6dq8m6ehMQ6d/rJQNj12VYHtXDSKcgOpIFEV4f9RuSkpj9/2SbBdmJPogNNwqY7zByIbui6eNYFE0OaKvzotdWResjwp9ds+/1T3oVsKojC5sTEu7JfG1Hf6LhiO6QUTiQKyAWKQtsN/lsH9UCt/YwLe0CU9/I0Y/phkSC6/ouiMQ06WBrykC3B1Tpolf+dXu1qKe3neN/8VSUSOruECtyG30dhK5x7U3HgAjc7ydnOmZcu65sg10FPT8Gv33Ws8Ww0aahz0MTkA5vNzlzL2AxTH2Qg== 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 X-Received: from CO1PR11MB4929.namprd11.prod.outlook.com (2603:10b6:303:6d::19) by SA0PR11MB4589.namprd11.prod.outlook.com (2603:10b6:806:9a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.37; Tue, 23 Jan 2024 23:26:57 +0000 X-Received: from CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::7e42:1633:d0a6:9c00]) by CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::7e42:1633:d0a6:9c00%6]) with mapi id 15.20.7202.035; Tue, 23 Jan 2024 23:26:56 +0000 From: "Michael D Kinney" To: "devel@edk2.groups.io" , "jbrasen@nvidia.com" CC: "gaoliming@byosoft.com.cn" , "Liu, Zhiguang" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH v2 1/1] MdePkg/BaseFdtLib: Rename standard functions Thread-Topic: [edk2-devel] [PATCH v2 1/1] MdePkg/BaseFdtLib: Rename standard functions Thread-Index: AQHaTlIpM6O2xn8WrkGO+XPOhqoBQbDoCpeA Date: Tue, 23 Jan 2024 23:26:56 +0000 Message-ID: References: <117b18420619e5b7065d678401063a6c24b2f52e.1706051719.git.jbrasen@nvidia.com> In-Reply-To: <117b18420619e5b7065d678401063a6c24b2f52e.1706051719.git.jbrasen@nvidia.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO1PR11MB4929:EE_|SA0PR11MB4589:EE_ x-ms-office365-filtering-correlation-id: 6fe21cae-b5db-4581-299f-08dc1c6aca73 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: JCrEy+3lyi6RwcABUFBZX77yqZNkPngubzItsJ9ZTlAWAxm36B7MZZap5NL5phsP3Uklwc1VveYz/HReiN2SBPIDb27PosgAecblo7IoCEykT3kut2j0UlyDFGzrN4nJyw4bQQaZNjITP+bILg3+1TBdRKmLITeeNiTX+0z0ph9zQYCCGiuYApbOEzVHqvjG0FgSh9TaxLte4r/ItRDnQh/kd3a6pnN3kgOWWOLWYheqp5lL+6Mb9ex5o32eAAW18O8uzZZP0BTErBX8gWavKmbAPyWD3pcgUe/++4xdln9dT6u7rPihdfY9jgxL40szp6zP6YNVA/NqRNRmwKlU9JqPA00csE9uogO6+fwL8lASoEuLUjoOQSUvGbnSPv037DZ2nqll4/sY6IaZ1GUL63j82jYmqHKVLyyJax7MlZvz4kL8Fz9yoKb0GgtqyqC0h8rkO7umgZwZIkHujEVkDBEZeATXJ4VjKKJp4N86sXYwWgRqOuE41zJ8hmrz2+5zB3Zst4xUFNzGT4MrAsCLYNZnL8nOqXFdurVTmn/W5mp0ncZhL7ROkWtQCUIHg7QpFmIAXcekXGgKJzt5VRhIG+plERkloJmg9n9WvBa6INh4rNBZ/vtikigpMsqZbbi1h0um7XfKDEFHxVZyDrgP/w== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Pcaqs2h7xAL0j8CaRzkR5N1yIUEgmYhYRJxaD52CQODtfhhcUHcFp6dTrAaC?= =?us-ascii?Q?85n6ltvZx1cd96LHDO3swUAYSBlcK1N98qCa05wj2BPmWqEvJ1s7+MzhiMST?= =?us-ascii?Q?CcZteO/TTXMyeh/hBHOnyerrGQyEce40R9s5Jc9SQcMffldRe4H0VWyx+4iu?= =?us-ascii?Q?nyh/NT7Elb39OynmBwu9j+5wqOuSswWTTDfK+DUVfTf4L1zcIE5EjVNRNbyc?= =?us-ascii?Q?mOPYmig6gW5MfrS1+8KmqfCweVsLdAE9pTmHx0q639Y9VK6TMky1Mps50iil?= =?us-ascii?Q?cm/Dthtcwa6JEwmW8sTUKhFBX6Jw2s0iHRaLt8uyIDArmBn3gwMG4q3DyosC?= =?us-ascii?Q?AlKlOmOCpcKgDpDsqzlRTD51gVtiQCxl7Ipe/tPB2mNrl4Sl8Fteibx5O37J?= =?us-ascii?Q?9i0eoaX1m9NpunZJkYJfFX6Yji0OueJkXYO0lEBcKnMhfwAREs3q5J+5Lwsh?= =?us-ascii?Q?jjopX3hCt6xKRoNVrmAIJJsQ0m8Qc8eS/tOuzs+ga+KX74YMZtsuODCj47Qz?= =?us-ascii?Q?NZVW49+nQzaCbag9m2tTD1Z/gfyn9ZfNy/3jgDAy6lWb+FB0hW+p3J3v0Qdj?= =?us-ascii?Q?wkOTRBb4P+Y3UO4WRWHJ6b7K8+91ubp5gwy2SnwmtLteJPFvfbgz/uQ69QWf?= =?us-ascii?Q?HjUGwAUPmeCACayg5FkGwZv+sGi4wn/lYyTfq6csFvbw5/Lzz8ozVGjGX2Gm?= =?us-ascii?Q?yGZIiTXiNhL6Z9AXM/7/qoHUQ7sLsyhkN37vccXeWJ7/RpTTNdaxVYNkoPyN?= =?us-ascii?Q?xhMV/q+T8CdRUviAZyQlC1kDMj1bw23hQaub0V6eQ6xqKhk/3a9gnLBnwef9?= =?us-ascii?Q?7K9lxe+4vCEzJYK0OTcvzAKbr5mzHAfvZyKW8t1eil9ZyEX6W4dhJbMMr8R8?= =?us-ascii?Q?TLpl0pitg2rRcb1z2AtF5264/5NcIwKfZa91XzCasqHjotmDhcZ8CuYiZQdU?= =?us-ascii?Q?C7mYDer8Pez1t+tYJMMUzWg4cgogHg6DM8gWcjE1RisWHD+6bzeZjXhOVvwa?= =?us-ascii?Q?Ks52OEYuv4YMdbERKxNtgXQ321eTOBI5StjTNIjvddsmAKknNTNb6hbPk1qr?= =?us-ascii?Q?BZLoDMvsBO+HV2Nwqvr3U8g5SjkQBItK2fJ40+DnNb1BFaz7GuMysNw+EHd9?= =?us-ascii?Q?sq33/sC7PHxhy8y/0WbhRDPwmZiuVw86sLXzDGvQ7hQAUcLBfKqi1x2Axgew?= =?us-ascii?Q?/SX+HA60+xaU+Gqn/4OKjOzWPWA9z73yWYR6wJF7DOpuRISpu/KNuzeF/zOE?= =?us-ascii?Q?Kt67m6MeKUnW/XFP3+O2Luh7NmkZM2eFMz4ZuHu01TamslfF3mbFIeXg04t4?= =?us-ascii?Q?bxGwl+RVPRHd14FSsTQW1xHCdx5T9Kqv9BHyQ2z0jm9QFNIlFcmPpfk9K0yz?= =?us-ascii?Q?2So27D9+wqleR4Crj+2lvSkyCq9xfRJqiW6a/kQVmEEdkXVP/Pc4lZasK5Ni?= =?us-ascii?Q?xeUYjkXfXr4gHBrA6hEuSkLGI/nyavRYs8fhldfP1fXJoYnamSeB+qI9PeJt?= =?us-ascii?Q?ron5URl5/YqCdxnNgGhem5Yy8TC/VSdQKeo6y6Y/8E8FFJ1Zw0GC1wHKIPrF?= =?us-ascii?Q?tOFi/bbskxsn45mG0F9ZzkSsszV7zC9y2iVMM9k6z6u235cK/nPgpTX3D8u9?= =?us-ascii?Q?UQ=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4929.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fe21cae-b5db-4581-299f-08dc1c6aca73 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jan 2024 23:26:56.7944 (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: mYOO8WzF3z8Z5q8gJemqxEr27Q224DVb1DSvaz99z3oJR6dwzv+AmEClxGEB8mdKe+gfYTX4bWJyT0oWcQBt/6uZrv/5t0O40qo4IIIFRio= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4589 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: GBYrT55SBK2UfAoVME3ohhc4x7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=LLfrJlFa; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}") Reviewed-by: Michael D Kinney > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Jeff > Brasen via groups.io > Sent: Tuesday, January 23, 2024 3:16 PM > To: devel@edk2.groups.io > Cc: gaoliming@byosoft.com.cn; Kinney, Michael D > ; Liu, Zhiguang ; > Jeff Brasen > Subject: [edk2-devel] [PATCH v2 1/1] MdePkg/BaseFdtLib: Rename standard > functions >=20 > Rename the standard functions in the LibFdtSupport to remove conflicts > with other libraries that define them. >=20 > Signed-off-by: Jeff Brasen > --- > MdePkg/Library/BaseFdtLib/LibFdtSupport.h | 7 +++++-- > MdePkg/Library/BaseFdtLib/LibFdtWrapper.c | 25 ++--------------------- > 2 files changed, 7 insertions(+), 25 deletions(-) >=20 > diff --git a/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > b/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > index 393019324b73..8a26fbfc3251 100644 > --- a/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > +++ b/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > @@ -63,13 +63,13 @@ strchr ( > ); >=20 > char * > -strrchr ( > +fdt_strrchr ( > const char *, > int > ); >=20 > unsigned long > -strtoul ( > +fdt_strtoul ( > const char *, > char **, > int > @@ -93,7 +93,10 @@ strcpy ( > #define strnlen(str, count) (size_t)(AsciiStrnLenS(str, > count)) > #define strncpy(strDest, strSource, count) AsciiStrnCpyS(strDest, > MAX_STRING_SIZE, strSource, (UINTN)count) > #define strcat(strDest, strSource) AsciiStrCatS(strDest, > MAX_STRING_SIZE, strSource) > +#define strchr(str, ch) ScanMem8(str, AsciiStrSize > (str), (UINT8)ch) > #define strcmp(string1, string2, count) (int)(AsciiStrCmp(string1, > string2)) > #define strncmp(string1, string2, count) (int)(AsciiStrnCmp(string1, > string2, (UINTN)(count))) > +#define strrchr(str, ch) fdt_strrchr(str, ch) > +#define strtoul(ptr, end_ptr, base) fdt_strtoul(ptr, end_ptr, > base) >=20 > #endif /* FDT_LIB_SUPPORT_H_ */ > diff --git a/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c > b/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c > index ef6452914f5b..1a4cd573fdaf 100644 > --- a/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c > +++ b/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c > @@ -18,28 +18,7 @@ > // so the code gets a bit clunky to handle that case specifically. >=20 > char * > -strchr ( > - const char *Str, > - int Char > - ) > -{ > - char *S; > - > - S =3D (char *)Str; > - > - for ( ; ; S++) { > - if (*S =3D=3D Char) { > - return S; > - } > - > - if (*S =3D=3D '\0') { > - return NULL; > - } > - } > -} > - > -char * > -strrchr ( > +fdt_strrchr ( > const char *Str, > int Char > ) > @@ -71,7 +50,7 @@ __isspace ( > } >=20 > unsigned long > -strtoul ( > +fdt_strtoul ( > const char *Nptr, > char **EndPtr, > int Base > -- > 2.34.1 >=20 >=20 >=20 >=20 >=20 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#114242): https://edk2.groups.io/g/devel/message/114242 Mute This Topic: https://groups.io/mt/103921658/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-