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 D6DDE94198F for ; Tue, 23 Jan 2024 21:55:54 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=DMEBAmw4JNutRdKBap8IauvP/v7wqiZvyvQgeEnEv+M=; 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=1706046953; v=1; b=VEQ6hoAjnv8tnfA4TvlESkk617C1JCf1LTYqTLg2+GFNKSBz9RTU7QSeEMi+2rsMGTR570KV ozimhWgQqD6x1DeTOpGmI898sj0nPtKMImVHt17orE92OWEx2JGAVmI/GS8KJuOO9ljFQsYvKti YoVqDJ6Yg16BG6xHHRE79yKo= X-Received: by 127.0.0.2 with SMTP id rcf9YY7687511xXyoJuGgutd; Tue, 23 Jan 2024 13:55:53 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mx.groups.io with SMTP id smtpd.web10.7396.1706046952556383290 for ; Tue, 23 Jan 2024 13:55:52 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="9028576" X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="9028576" X-Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2024 13:55:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="1822616" X-Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmviesa004.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 23 Jan 2024 13:55:51 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx603.amr.corp.intel.com (10.18.126.83) 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 13:55:50 -0800 X-Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) 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; Tue, 23 Jan 2024 13:55:50 -0800 X-Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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 via Frontend Transport; Tue, 23 Jan 2024 13:55:50 -0800 X-Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) by edgegateway.intel.com (192.55.55.71) 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 13:55:50 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XOWF2uHbP3XQ/1KKYyUdmx5V7rkW9ATI/7EiOvOXV4j2W0xjOW7rDNfu7Vtt4xTvw7nDGrNW8JpfL0VvuAqZjuJKuEVHNT6XLJ2XrUdnaPWTfTcivpe2qDlM1FuDh4NrG2NbgLj4fvDGxeFxv9fgtQMyXFtjTkV2vRwHiE41XbcgnSpNNRAX5jaSm3As7VCGgBrmtaCdLD2QlzWanNVbtP1sKm7aQgoWsuhsG492XzinCB4PoSsGcOUI7zINYtLk34ppTOY372gSc6WzPjmLKqnOMmAUxyKqYZwnwp6EdbbFCLl8hhamspiEaMQnCLoFYhBIuKnEtU1IVPv1pMHWpw== 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=K1IkOop3L9t2EsDAnMf7hBtRLQObNt5e78WHBj8qc9w=; b=drQ9pji9s0H9jsDVwZfXcxluYHdNfvc8hPkCoqNI497Qzudl5DZYg0yArXf8zecIRLn7DZJMbVmBRZY7LdzghJR3kdK4XoU/dVwA6HRmbdcIjY84M6ud1KwVgd50Y11dSDNsNVq3wNXyEfxa5ljFHbdPaoePsO9gTXDYWeEVO/xlh9lYMlWtcqWj/7TPX0k+YeQBihRWgxH/AQVYURwaUce1LvX6iRyp+SUwUWggEwbsKr9PpnSDmuVOCa3KIt+kpZgqcN3PMFcc1Bk+yqyUv2EM+RhfoA8/YADUxgIjyPvS+g/oE48rDbXYvT13BGlbF+Yurtz8ME9zhwBLFvTbZQ== 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 DS7PR11MB7859.namprd11.prod.outlook.com (2603:10b6:8:da::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.34; Tue, 23 Jan 2024 21:55:47 +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 21:55:47 +0000 From: "Michael D Kinney" To: "devel@edk2.groups.io" , "jbrasen@nvidia.com" CC: "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH] MdePkg/BaseFdtLib: Rename standard functions Thread-Topic: [edk2-devel] [PATCH] MdePkg/BaseFdtLib: Rename standard functions Thread-Index: AQHaLEhZOXUy7vPzkkKhkddQheIjEbDoNNXA Date: Tue, 23 Jan 2024 21:55:47 +0000 Message-ID: References: <2c864678a4ae43a9cec9825b7f408c140ba1f18e.1702309158.git.jbrasen@nvidia.com> In-Reply-To: <2c864678a4ae43a9cec9825b7f408c140ba1f18e.1702309158.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_|DS7PR11MB7859:EE_ x-ms-office365-filtering-correlation-id: 6126725f-739a-4238-a091-08dc1c5e0e9f x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: sy2LS0QiaF3k1fybCh1izsBGBLKXYCIZRoUNp7aZGVxKvZTDW7sElB25xs+Uc2jfcYLucemmg3vXEIMZ0z41wVAMJBFNmWZFmYH7ay3/ADm5RgTLJ13IjJ2y1efN28Z9AoyRFNZefzNLgGgE/IA1GLwALj0w2nBYCy3xQEOHLl3fEY4akFbR6DETAuozqZMczb/2Cb/5sIIMRgWmWhhYV3huXs/5Cz40GjpVr9WzEL1nR0jG1QVPnuxHNnMHgmul9R5IfFZ6XUpz+uXfX3RjpiYpt9sHbIw+UQGivbQOB9h2XI6sXd5XN072cjtfBRnn+Ne1qqLkzp2hCJvygFNDrhG7A2qmRaZ/HooHG0tptPLCc7nrus79qfiWMnkJS2qel/aZ/X5KfJ4rM+EHRBZ6JvVW1JP+ZpjDtGMLuTJCudZbS0QX8vWhlJKEO2sOm6xlSHilVREfjSQKlOOYvtKxUF28c7VQfgp3SBzeReO4p+ac5BO/q+zeBKDq444rms782U9+y7Q4DsYvVWMo5EDFYaCe9yeLapz25DUO58rSK53y+Nk4HwMVWVuz+slhYkukT4JI5FLOqd6RxZb4yI9H0D1Cv+nTdY/xaQKIt3uh8WrMTcPJe0KJkAPZBwBtgjGsmHskxzyOobCxtrWeqo6dZw== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Owkwf+pUQJKS65rVvh9iZJ8/Qtjo842/BXx7K+ZO+T1k3PZhdKxEskWDJ1op?= =?us-ascii?Q?ajcMm4DXlFPsj67o+NpIBAhmB8CeEH/R7QX+Ey9iIggDyd8kuacD6pOVafKe?= =?us-ascii?Q?O9EGI6wBESJhqXHmnpdvhhscD10NjwbEbNUdXidSCM4aR4cOFnGZd0i1fL0L?= =?us-ascii?Q?rkcf8UWvQZTAkhmfIP270szQPdKV/bfCCfpCwrM1Y6QlLNhsi2kJKsW5+3m2?= =?us-ascii?Q?8pD4Yvo53grbp0xd451r2MQoEbW0t2+M5buXaMMNMdO8mC1qpbRz71DV9Sf4?= =?us-ascii?Q?OKAqKKMMXoZ79X2E6ZO4hHpV9sVTT3e/0tIY5EhlTUniRreigqVZDBv2czOQ?= =?us-ascii?Q?Rm4mqBYlDD+NhdSMQf5/roIND18cFZvk9V3QFPe8G50vbm/XKKUgMxTxwh41?= =?us-ascii?Q?W2uDnonYFVeUmZxDAQxt3VOqxLLXETM+2mdz53vnWqIoNeprBX+AVN+p/TNX?= =?us-ascii?Q?b72/NrQmATpXNSyStQ6VlxnOFWfyEqa24fsaNUx3bdDHwef+l9r8TY56+/Hs?= =?us-ascii?Q?KqRypQq4GmchdmibRE8q/TzntSXY89vYxBMqxFNvl65trU9o5v2BqcJs/b/3?= =?us-ascii?Q?UzLXPsUe4TmqoomTztVqZYgecQrnU8f0SEEVCIphHQ1JO614uQVOw3yv39QY?= =?us-ascii?Q?c43y7GAnzS2NkzGkJiGNzO4gLAbC/vdV8tcgvFhV3qzVHYCEsLxldUHiyQGw?= =?us-ascii?Q?6Co9PAfiMOfplmi5flwFWJNprCoqbdkx5vsI/OAmS8YDk7wBnqWMljOui5ZW?= =?us-ascii?Q?fLv3crcRg468KnreuLBVshFiSgHGRaG+aLYRtVeQWbxyzP2cTamR86gQKBYy?= =?us-ascii?Q?big/eU0W1czOe2Kr7pw6TW72K6a/TRaLXJ6UGPAqh6Gu+QKXRqZ35RMgGwIL?= =?us-ascii?Q?CfsOnN3ODAv8QVUgHVFyv7ouGMkhSiBBm1j6e1Kj3lONouep4nE0N+KhFNxd?= =?us-ascii?Q?b+KvtEJvabn1yoV3m2JSM6xtRD0pgb0ljvC3xCjX55Iz6x4FXu+QV+b9+I89?= =?us-ascii?Q?xXOS1zuZjNzle5EchmzCrLGvRDLibLbZq5EvIxbBQNTE9aCbRwUCg+EYAqRE?= =?us-ascii?Q?4nL1calRsp6OusAAMv/f3HYTpAALNb27LLbGXhgHEaxdFcbOA5zYnkEGGZa6?= =?us-ascii?Q?ZrDq8sxptGM94yBUoFk4nUz+3+RoxzeKN0P1PtgpRWnA8a/dkkOweiwGfggk?= =?us-ascii?Q?8/rWzVW3LIIXPPqkdqdWAIIG7qmrzDCk+kxKlKOqMZPdOB0VV6gtX1MKElrq?= =?us-ascii?Q?e20ab0MIDB9RSxe3rQKbuMgHu2JcUQYqy4M+T0EFjjo0pmnzoZfW5BXFU/p5?= =?us-ascii?Q?+3R8jLO/8JlSj6oak3DG/hUKLH5JBu2Olh2V4ftinfh7p/5vhkzMjDWw+IyO?= =?us-ascii?Q?UDWl1aAy8Q2PoS8ETo55ckVK1V3/S2Bgdj7MByZqSxMiV8JyszZuPaNAQ5U1?= =?us-ascii?Q?DIvqjELgs+eO5gQDfYnFZtk7lH1zVehvTHu6PDDeFB/FPSUKtzvqqHFJgPI8?= =?us-ascii?Q?QksBSPNvT/3UDrW2+Hr9EY88JCt0QoWvtuHSrvB3tJG3WreWrtQhe5mAd4Pv?= =?us-ascii?Q?ljbJQWt1TqSv7Gq7JZQS8FmSJ+kJ4rKccF94dktC+YS6QNLiq/jcE1us9psn?= =?us-ascii?Q?yA=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: 6126725f-739a-4238-a091-08dc1c5e0e9f X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jan 2024 21:55:47.7189 (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: qzD7w7iGeogHnjL3KPLEnWfmWidnj7re4Eoqkb5x/G/cKZtldlmexb4QV5CLwk7wxvy/1M4aeBJxilpjYsjAzfVpTv7sUGKMvTcpzAjTPso= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB7859 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: Tjahvyz6feLWsYvpwpgR0nPbx7686176AA= 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=VEQ6hoAj; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Hi Jeff, One comment below. Mike > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Jeff > Brasen via groups.io > Sent: Monday, December 11, 2023 7:40 AM > To: devel@edk2.groups.io > Cc: Jeff Brasen > Subject: [edk2-devel] [PATCH] 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 | 16 +++++++++++++++ > MdePkg/Library/BaseFdtLib/LibFdtWrapper.c | 25 ++--------------------- > 2 files changed, 18 insertions(+), 23 deletions(-) >=20 > diff --git a/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > b/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > index 393019324b..47beac9fac 100644 > --- a/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > +++ b/MdePkg/Library/BaseFdtLib/LibFdtSupport.h > @@ -68,6 +68,12 @@ strrchr ( > int > ); >=20 > +char * > +fdt_strrchr ( > + const char *, > + int > + ); > + > unsigned long > strtoul ( > const char *, > @@ -75,6 +81,13 @@ strtoul ( > int > ); Since stroul() is defined to something else, is the function prototype requ= ired? Same comment for strrchr() >=20 > +unsigned long > +fdt_strtoul ( > + const char *, > + char **, > + int > + ); > + > char * > strcpy ( > char *strDest, > @@ -93,7 +106,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 ef6452914f..1a4cd573fd 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 (#114232): https://edk2.groups.io/g/devel/message/114232 Mute This Topic: https://groups.io/mt/103110792/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-