From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 970D5D80CAA for ; Wed, 17 Jul 2024 16:10:08 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=VrHkNZ4ua2INRB/yfA+Mer0hqaOcgc3LkO8j9jmh2pE=; c=relaxed/simple; d=groups.io; h=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:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1721232608; v=1; b=FF946yhgBQYC0rabAJ41jxkWK9HqbSauieVTA5kQDJgVxrbe1sY0mGOdpoS1CUCzVOoYMYwb K/LWSJnYk4XA44JVGZTOj8nfmym5NR0zpDnTSPJbkaeshvWOpiIGtQHCw+UA6bDNuSNOQ9oHt/p wlk0ooR+2YnQMlHXc4s34Y61949O8pKO7wq3nTRnLv+7Tqn3nG/WRtSgCZHsI9WpAruOWb80NgD qXm44Y07VRIwkFELSspdVC3xv0T6MtCbHNfg6IMsxS0KpPiGZsn2TSRiWoHuDEuZcIAQhK1qvhd JLBnrUfzqeOOjwQVtZpFl9AzJYi+nL7xYZEy/WQwb/mFw== X-Received: by 127.0.0.2 with SMTP id zRrFYY7687511xWvKgwg6cq3; Wed, 17 Jul 2024 09:10:07 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by mx.groups.io with SMTP id smtpd.web11.2397.1721232606466924419 for ; Wed, 17 Jul 2024 09:10:06 -0700 X-CSE-ConnectionGUID: JTAERZbQTXWDgKXmN6KiVw== X-CSE-MsgGUID: 8TDHr0WNRdu8bCYv7i7Fvw== X-IronPort-AV: E=McAfee;i="6700,10204,11136"; a="22513864" X-IronPort-AV: E=Sophos;i="6.09,215,1716274800"; d="scan'208";a="22513864" X-Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jul 2024 09:10:01 -0700 X-CSE-ConnectionGUID: D2avpSWIQQSI3Xrnq8SszA== X-CSE-MsgGUID: exVJ9qwjR7aHZpvClZr87w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,215,1716274800"; d="scan'208";a="50386550" X-Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmviesa009.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 17 Jul 2024 09:10:02 -0700 X-Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) 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.39; Wed, 17 Jul 2024 09:10:00 -0700 X-Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Wed, 17 Jul 2024 09:10:00 -0700 X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.49) 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.39; Wed, 17 Jul 2024 09:10:00 -0700 X-Received: from CO1PR11MB4929.namprd11.prod.outlook.com (2603:10b6:303:6d::19) by CY5PR11MB6536.namprd11.prod.outlook.com (2603:10b6:930:40::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.14; Wed, 17 Jul 2024 16:09:57 +0000 X-Received: from CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::a886:6510:729d:f9d0]) by CO1PR11MB4929.namprd11.prod.outlook.com ([fe80::a886:6510:729d:f9d0%4]) with mapi id 15.20.7762.027; Wed, 17 Jul 2024 16:09:57 +0000 From: "Michael D Kinney" To: "Jayaprakash, N" , "devel@edk2.groups.io" CC: Rebecca Cran , "Kinney, Michael D" Subject: Re: [edk2-devel] [edk2-libc Patch 1/1] edk2-libc: Support for compiling Python UEFI interpreter with VS2022 Thread-Topic: [edk2-libc Patch 1/1] edk2-libc: Support for compiling Python UEFI interpreter with VS2022 Thread-Index: AQHa2BdB4ZV4XTxc20+HSXXsOSIN/rH7Fz7g Date: Wed, 17 Jul 2024 16:09:56 +0000 Message-ID: References: <20240717070053.323-1-n.jayaprakash@intel.com> <20240717070053.323-2-n.jayaprakash@intel.com> In-Reply-To: <20240717070053.323-2-n.jayaprakash@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CO1PR11MB4929:EE_|CY5PR11MB6536:EE_ x-ms-office365-filtering-correlation-id: dd2d2207-02cf-429b-59ae-08dca67ae6fa x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: =?us-ascii?Q?aF11a90UwBk8krbIx1Z/6jOJBTfle4TMPCytKf1sQcPmoLnCVghgJ2CkE8XJ?= =?us-ascii?Q?x/kxRowXQcCxDcwoZRm+IqSqZsomTtkeMbxxewntIp4REsZy6Md+IrVVoZix?= =?us-ascii?Q?2a6EkO+pOJjyXmrAbjzhvFTlPpW+WMBwNL03ywQ21AlKNumtN5wZjPZWrnEf?= =?us-ascii?Q?roJAYfiLglprT00bJXyfAQyY6tkkUU4nPmn+2J/V4993pnfhzfW/DeL7mOpd?= =?us-ascii?Q?kgKbyw+vrluLcR22ELqGBdfsEbLSbLxJkrtetwlKqrXotYplS9Gw4bgcx+zK?= =?us-ascii?Q?h78Hr1495TS7CcmrDgZpHk5sCgZEYeBSUESqyh3E9Ua7JIFRZMc4dGrbUWKS?= =?us-ascii?Q?IGT1ZQ03aZyB+4x6N1JvkpNI3cKmI0ORdi2n2ph5ysp8J3QJ9dqccnMvN+Uf?= =?us-ascii?Q?wvcL3a4ooKiXhVE+1xwxIul2E5zAHhmO7jVLtyEaWAg2XMPAyybBR4dLYiX4?= =?us-ascii?Q?qiRxN83ixminznHVeVXDhwYLw3kfY6U4MWNA4RJcJfVWxHZ0npyX1ECTmU1M?= =?us-ascii?Q?bX4wi5ov+sXSuyZ90uC6/t1jyMHhyolOrTkkbSPNAYB48OvAfo9uGA0lUVgU?= =?us-ascii?Q?876ssJlGvIteoRBO9DksqhoK/d2bZgzEfmKZUQgfbaF6BFMwz8rwKEjll97M?= =?us-ascii?Q?oMBEWXW5YeF7hvaWctraUgfNG0WmgAG16bEDbmN1zczudvYJ1iWMrhpSnXI3?= =?us-ascii?Q?bmA9U6ZGOnti0cuq8H1SEOly6YsoySP2fP7z0kNrxY3fhOusUlO0NKalfYqx?= =?us-ascii?Q?xBUva/L+HbkmBnBoo26RBJd6Hrgsdm358CErpss0XuzyB9Tc9ACfY/zI4AF0?= =?us-ascii?Q?w1kQcrl1hZQdXV0R1QsaTMQKQiYhjTqeyzsvb4Adg5OQm43DRVfVSCAHoRfD?= =?us-ascii?Q?/jXH8rryrmulvIhQCfaQTY96paRlvccoMawTc34TotJovmnc04+VwNRWNXPF?= =?us-ascii?Q?YzIk/tWtCP4E7aEmguuJcaGLQ5euOxysMomKxRMo9qSmuTOUspaTwyMWTxbz?= =?us-ascii?Q?jeExc+At7URvAOGo3vIUbnIG2gICuTIHTLzk/UXNtkJDCgf7yXBXvQAvQyn4?= =?us-ascii?Q?u2k7nlMDRkOdSIoOISHwOCNZENT5KbprvSksLRcMC5uuCJdol7nKR+IjTJFi?= =?us-ascii?Q?mPJnbAXNtu8g+9Hfbt0bq9Wd9HRq9iT4I3jXCTcxsz/SwToKjy/5xgDOnS0i?= =?us-ascii?Q?yi8Cide123ETnfLPcbGT3SqbZDCw8Ba+cANPh0Qh+xjqaHz9yQEW2ZpvxKab?= =?us-ascii?Q?+e6FqcZJouc9bWWH/bzPZMtKpYAYXGzF2C/Cia/LnpWZDbvYfh55Sv9/xsx4?= =?us-ascii?Q?8HGNYcGsjJNZNkvQ2p/+/34Tgq91KhXJ/PBpPqwMOO6GMoIqNjEQfum40Pz9?= =?us-ascii?Q?z1xSKdM=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?NeGL7V9pSzDAC+1ACxuZy9oUXctN6lRdEJJ+eePrtKMc7Omv5EoTakv/gfeW?= =?us-ascii?Q?iPj+u8YY+sA1Y0AFpZwxW0y/QG8iKdQgPWZ4/SAXp7uCAnDOoM6JH/JVt2TV?= =?us-ascii?Q?ivgN91Rf+sGHwrI3cR0dNavRgxpN0JXQLhsKp9Tqm5NCLkRZPB9Imawjzrk1?= =?us-ascii?Q?rgrioT6fHRM8rLSy/U82G0A3PVIeeDhAvRrI5QLs/qH++Oyj3R55qj6EL2h9?= =?us-ascii?Q?GMBOw7QDJR4N4J0S0N7/SeqSipcJwFfW3yiGkZ7EFqpfrzMzF9svlfnwtHuq?= =?us-ascii?Q?ZwJo3BjY6dP5kazu1wk59SNZJL8FdO/N28lEAf6MoO6/hp/pd2WUFnmBD5/V?= =?us-ascii?Q?sYOzSFJ40EPFLAP7m1fWhizq1PgjFmv95v9Vt3nDd4suwlmYnaxeLv1I7SE8?= =?us-ascii?Q?PyHsJhQiFq1FHQgi7339MA7fq/bfG1EZvWMeGkXo7sUK4DEgiivFvccKzX3r?= =?us-ascii?Q?2uuJLuAGnQ7AKCOOLlyag7OC/RB4fiHskPTjLWRlMn3Qut/sSjlk7nCRRUw/?= =?us-ascii?Q?DfLNACSf6RTwFwmbinwIgjizAdS/Wtfn1oVEHDc54qq4/Pm07aIasDPnrLsx?= =?us-ascii?Q?atg+wDCBzjhnPWdBHeLm+s8kKWa6KcrP4B1QJ8Y/Cxq1fIFp23qHEdDgnpR7?= =?us-ascii?Q?XaIJE9G/Gc4l3Ors/mKWyXIeYZdhhFWGCGHveT0fU1YzvzFFzlpwVVuyC5ED?= =?us-ascii?Q?MOq4ThbkhuRm6cFI7MSz1orBsQ3z0oG5qHklIm5BELBLShjqOAm/TM5TXu+1?= =?us-ascii?Q?YMlHdm3QhaxBH5K4/+Sk1IrNnCgMEwJIxQl2RgllnX1/EFSn5wEsTTJW1jeE?= =?us-ascii?Q?yVydPmGtUYRD88VDx/Y5HrirxksJBslK2rlOWlzCvtkRxE2eUhjqYLxlChbf?= =?us-ascii?Q?pdZYhaMqhx/u8lpeRzHClZK+6/QBRMrTJGDiIOC/DIb0MP3P8JShZ2ORnEHR?= =?us-ascii?Q?KGflEZu3oUhck2XMaSvUJYaD0xylbuZGT45go4LyV7gTM7XoRDegfS7ZuAJo?= =?us-ascii?Q?qALh2/RaME9KUiRYU0roQf1IQJuY53glLVndwnEMHd16C/la5Gg7hY7Wgcu0?= =?us-ascii?Q?uWwg3XrtiSH7dtmUV8DCsjSG7JD+d2BATt5qnVHLqMQnjO4xn5+8aMQB9Ixd?= =?us-ascii?Q?47lgY4tId28NDYWpneF/skidu4OtcB6QOGOPPfGxrV58ISZ+c797oY8ADw/G?= =?us-ascii?Q?gfEkABJAuMjXSu3vsCl89mwkXCiYog0BXeNlMoObM+czqtJWv/HLsGZJBgSL?= =?us-ascii?Q?zDvuP0Mih7puU6T5t3pdYH1MHwUGld17z02xm+o0UktCinlayewG48OIHk1O?= =?us-ascii?Q?aehASmz5IJ6otidY75afRsqI5hsP5cIWW6acB+UmTi57bYP4eSD4ye0f5oKL?= =?us-ascii?Q?34tXWvDRENcR1EvriHzQH8JxJY6KLkUaLCuiuNkk4mOBuJ3OJIY10otpnJ2D?= =?us-ascii?Q?IdmJKEW/qXqC014WNCWZGJS4VoZl6mU+L2lmiVrvROyycvk8GwrgwFSrmojk?= =?us-ascii?Q?ID9dzRI2Ltjo2KsiyU7BZIwco129+2J+x7csguclTeFOd5fJRUC9cIzAxwr+?= =?us-ascii?Q?HCfvHiJ6vfqMfuldjR3fnJ6gRAik7i0HYKT+41jU?= 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: dd2d2207-02cf-429b-59ae-08dca67ae6fa X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2024 16:09:57.0967 (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: RVrDCwHeGcasXPGHDjmJ/mbor+98i+6Z5JYl7i1mWbYiJ1IfY9ZBu+Pp8VZvpmkE/z93JDkA3QlGLCyyz7EdxlUdSsOiTOOZTBDwxfuj6o4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6536 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 Resent-Date: Wed, 17 Jul 2024 09:10:06 -0700 Resent-From: michael.d.kinney@intel.com Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: CstXSHiScZQDKMad47xVkq9Kx7686176AA= 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=20240206 header.b=FF946yhg; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 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) Can you list the compiler errors that are being fixed by this patch? Mike > -----Original Message----- > From: Jayaprakash, N > Sent: Tuesday, July 16, 2024 11:59 PM > To: devel@edk2.groups.io > Cc: Jayaprakash, N ; Rebecca Cran > ; Kinney, Michael D > Subject: [edk2-libc Patch 1/1] edk2-libc: Support for compiling Python UE= FI > interpreter with VS2022 >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4811 >=20 > This commit fixes the compilation issues observed with several > components in the edk2-libc repo while trying to compile Python > interpreter for UEFI. >=20 > Cc: Rebecca Cran > Cc: Michael D Kinney > Cc: Jayaprakash N > Signed-off-by: Jayaprakash N > --- > AppPkg/Applications/Enquire/Enquire.c | 48 +++++------ > .../OrderedCollectionTest.c | 10 +-- > .../Sockets/DataSource/DataSource.c | 10 +-- > AppPkg/Applications/Sockets/OobRx/OobRx.c | 4 +- > .../Applications/Sockets/RawIp4Rx/RawIp4Rx.c | 4 +- > StdLib/BsdSocketLib/getnetbyht.c | 9 ++- > StdLib/BsdSocketLib/ns_print.c | 57 +++++++------ > StdLib/EfiSocketLib/Socket.c | 80 +++++++++---------- > 8 files changed, 116 insertions(+), 106 deletions(-) >=20 > diff --git a/AppPkg/Applications/Enquire/Enquire.c > b/AppPkg/Applications/Enquire/Enquire.c > index 1e1db69..5e34f48 100644 > --- a/AppPkg/Applications/Enquire/Enquire.c > +++ b/AppPkg/Applications/Enquire/Enquire.c > @@ -5,7 +5,7 @@ > Steven Pemberton, CWI, Amsterdam; "Steven.Pemberton@cwi.nl" > Used with permission. >=20 > - Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved. > + Copyright (c) 2010 - 2024, Intel Corporation. All rights reserved. > This program and the accompanying materials > are licensed and made available under the terms and conditions of th= e > BSD License > which accompanies this distribution. The full text of the license ma= y be > found at > @@ -918,15 +918,15 @@ memeq( > } >=20 > Void > -farewell(int bugs) > +farewell(int bugs_local) > { > - if (bugs =3D=3D 0) exit(0); > + if (bugs_local =3D=3D 0) exit(0); > printf("\n%sFor hints on dealing with the ", co); > - if (bugs =3D=3D 1) printf("problem"); > - else printf("%d problems", bugs); > + if (bugs_local =3D=3D 1) printf("problem"); > + else printf("%d problems", bugs_local); > printf(" above\n see the section 'TROUBLESHOOTING' in the file "); > printf("%s%s\n", FILENAME, oc); > - exit(bugs); > + exit(bugs_local); > } >=20 > /* The program has received a signal where it wasn't expecting one */ > @@ -1927,51 +1927,51 @@ int cprop( void ) >=20 > if (c_signed) { > #ifndef NO_UC > -/* Syntax error? Define NO_UC */ Volatile unsigned char c1, char_max; > - c1=3D0; char_max=3D0; > +/* Syntax error? Define NO_UC */ Volatile unsigned char c1, char_max_loc= al; > + c1=3D0; char_max_local=3D0; > c1++; > - if (setjmp(lab)=3D=3D0) { /* Yields char_max */ > - while (c1>char_max) { > - char_max=3Dc1; > + if (setjmp(lab)=3D=3D0) { /* Yields char_max_local */ > + while (c1>char_max_local) { > + char_max_local=3Dc1; > c1++; > } > } > Unexpected(4); > if (sizeof(char) =3D=3D sizeof(int)) { > u_define(D_UCHAR_MAX, "", "UCHAR", "_MAX", > - (ulong) char_max, > + (ulong) char_max_local, > (ulong) UCHAR_MAX, ""); > } else { > i_define(D_UCHAR_MAX, "", "UCHAR", "_MAX", > - (long) char_max, 0L, > + (long) char_max_local, 0L, > (long) UCHAR_MAX, ""); > } > #endif > } else { > #ifndef NO_SC > -/* Syntax error? Define NO_SC */ Volatile signed char c1, char_max, > char_min; > - c1=3D0; char_max=3D0; > +/* Syntax error? Define NO_SC */ Volatile signed char c1, char_max_local= , > char_min_local; > + c1=3D0; char_max_local=3D0; > c1++; > - if (setjmp(lab)=3D=3D0) { /* Yields char_max */ > - while (c1>char_max) { > - char_max=3Dc1; > + if (setjmp(lab)=3D=3D0) { /* Yields char_max_local */ > + while (c1>char_max_local) { > + char_max_local=3Dc1; > c1++; > } > } > - c1=3D0; char_min=3D0; > + c1=3D0; char_min_local=3D0; > c1--; > - if (setjmp(lab)=3D=3D0) { /* Yields char_min */ > - while (c1 - char_min=3Dc1; > + if (setjmp(lab)=3D=3D0) { /* Yields char_min_local */ > + while (c1 + char_min_local=3Dc1; > c1--; > } > } > Unexpected(5); > i_define(D_SCHAR_MIN, "", "SCHAR", "_MIN", > - (long) char_min, (long) maxint, > + (long) char_min_local, (long) maxint, > (long) SCHAR_MIN, ""); > i_define(D_SCHAR_MAX, "", "SCHAR", "_MAX", > - (long) char_max, 0L, > + (long) char_max_local, 0L, > (long) SCHAR_MAX, ""); > #endif /* NO_SC */ > } > diff --git > a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c > b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c > index 712ee8f..ea44b31 100644 > --- a/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c > +++ b/AppPkg/Applications/OrderedCollectionTest/OrderedCollectionTest.c > @@ -7,7 +7,7 @@ > per default, eg. serial line). >=20 > Copyright (C) 2014, Red Hat, Inc. > - Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.
> + Copyright (c) 2010 - 2024, Intel Corporation. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent > **/ > @@ -458,10 +458,10 @@ SetupInputOutput ( >=20 > case 'h': > fprintf (stderr, > - "%1$s: simple OrderedCollectionLib tester\n" > + "%s: simple OrderedCollectionLib tester\n" > "\n" > - "Usage: 1. %1$s [-i InputFile] [-o OutputFile]\n" > - " 2. %1$s -h\n" > + "Usage: 1. %s [-i InputFile] [-o OutputFile]\n" > + " 2. %s -h\n" > "\n" > "Options:\n" > " -i InputFile : read commands from InputFile\n" > @@ -469,7 +469,7 @@ SetupInputOutput ( > " -o OutputFile: write command responses to OutputFile\n" > " (will write to stdout if absent)\n" > " -h : print this help and exit\n" > - "\n", ArgV[0]); > + "\n", ArgV[0], ArgV[0], ArgV[0]); > ListCommands (); > exit (EXIT_SUCCESS); >=20 > diff --git a/AppPkg/Applications/Sockets/DataSource/DataSource.c > b/AppPkg/Applications/Sockets/DataSource/DataSource.c > index 360689e..0ca6a9a 100644 > --- a/AppPkg/Applications/Sockets/DataSource/DataSource.c > +++ b/AppPkg/Applications/Sockets/DataSource/DataSource.c > @@ -1,7 +1,7 @@ > /** @file > Data source for network testing. >=20 > - Copyright (c) 2011-2012, Intel Corporation. All rights reserved. > + Copyright (c) 2011-2024, Intel Corporation. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -538,7 +538,7 @@ EFI_STATUS > SocketSend ( > ) > { > - size_t BytesSent; > + size_t BytesSentLocal; > EFI_STATUS Status; > EFI_TPL TplPrevious; >=20 > @@ -562,8 +562,8 @@ SocketSend ( > // > // Send some bytes > // > - BytesSent =3D write ( Socket, &Buffer[0], sizeof ( Buffer )); > - if ( -1 =3D=3D BytesSent ) { > + BytesSentLocal =3D write ( Socket, &Buffer[0], sizeof ( Buffer )); > + if ( -1 =3D=3D BytesSentLocal ) { > DEBUG (( DEBUG_INFO, > "ERROR: send failed, errno: %d\r\n", > errno )); > @@ -589,7 +589,7 @@ Status =3D EFI_NOT_STARTED; > // > // Account for the data sent > // > - TotalBytesSent +=3D BytesSent; > + TotalBytesSent +=3D BytesSentLocal; >=20 > // > // Release the TimerCallback routine synchronization > diff --git a/AppPkg/Applications/Sockets/OobRx/OobRx.c > b/AppPkg/Applications/Sockets/OobRx/OobRx.c > index 28e10d8..af07127 100644 > --- a/AppPkg/Applications/Sockets/OobRx/OobRx.c > +++ b/AppPkg/Applications/Sockets/OobRx/OobRx.c > @@ -150,7 +150,7 @@ OobRx ( > // > // Display the received OOB data > // > - printf ( "%5Ld OOB bytes received\r\n", (UINT64)BytesReceive= d ); > + printf ( "%5llu OOB bytes received\r\n", (UINT64)BytesReceiv= ed > ); >=20 > // > // Account for the bytes received > @@ -183,7 +183,7 @@ OobRx ( > // > // Display the received data > // > - printf ( "%4Ld bytes received\r\n", (UINT64)BytesReceived = ); > + printf ( "%4llu bytes received\r\n", (UINT64)BytesReceived= ); >=20 > // > // Account for the bytes received > diff --git a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c > b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c > index b52cd38..b190b44 100644 > --- a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c > +++ b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.c > @@ -1,7 +1,7 @@ > /** @file > Raw IP4 receive application >=20 > - Copyright (c) 2011-2012, Intel Corporation. All rights reserved. > + Copyright (c) 2011-2024, Intel Corporation. All rights reserved. > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ > @@ -157,7 +157,7 @@ RawIp4Rx ( > // Display the bytes received > // > if ( 0 =3D=3D RetVal ) { > - printf ( "Total Bytes Received: %Ld\r\n", TotalBytesReceived = ); > + printf ( "Total Bytes Received: %llu\r\n", TotalBytesReceived= ); > } >=20 > // > diff --git a/StdLib/BsdSocketLib/getnetbyht.c > b/StdLib/BsdSocketLib/getnetbyht.c > index 08b8042..5907d44 100644 > --- a/StdLib/BsdSocketLib/getnetbyht.c > +++ b/StdLib/BsdSocketLib/getnetbyht.c > @@ -41,6 +41,11 @@ > * from getnetent.c 1.1 (Coimbra) 93/06/02 > */ >=20 > +/* > + * Copyright (c) 2024, Intel Corporation. All rights reserved. > + * SPDX-License-Identifier: BSD-2-Clause-Patent > + */ > + > #if defined(LIBC_SCCS) && !defined(lint) > static char sccsid[] =3D "@(#)getnetent.c 8.1 (Berkeley) 6/4/93"; > static char orig_rcsid[] =3D "From: Id: getnetent.c,v 8.4 1997/06/01 20:= 34:37 > vixie Exp"; > @@ -155,13 +160,13 @@ found: > } >=20 > struct netent * > -_getnetbyhtaddr(register unsigned long net, register int type) > +_getnetbyhtaddr(register unsigned long net_local, register int type) > { > register struct netent *p; >=20 > setnetent(_net_stayopen); > while ( NULL !=3D (p =3D getnetent()) ) > - if (p->n_addrtype =3D=3D type && p->n_net =3D=3D net) > + if (p->n_addrtype =3D=3D type && p->n_net =3D=3D net_local) > break; > if (!_net_stayopen) > endnetent(); > diff --git a/StdLib/BsdSocketLib/ns_print.c b/StdLib/BsdSocketLib/ns_prin= t.c > index ea29d01..fb19bf9 100644 > --- a/StdLib/BsdSocketLib/ns_print.c > +++ b/StdLib/BsdSocketLib/ns_print.c > @@ -55,6 +55,11 @@ > * > */ >=20 > +/* > + * Copyright (c) 2024, Intel Corporation. All rights reserved. > + * SPDX-License-Identifier: BSD-2-Clause-Patent > + */ > + > /* Import. */ >=20 > #include > @@ -211,7 +216,7 @@ ns_sprintrrf(const u_char *msg, size_t msglen, > break; >=20 > case ns_t_soa: { > - u_long t; > + u_long t_local; >=20 > /* Server name. */ > T(addname(msg, msglen, &rdata, origin, &buf, &buflen)); > @@ -226,45 +231,45 @@ ns_sprintrrf(const u_char *msg, size_t msglen, > goto formerr; >=20 > /* Serial number. */ > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > T(addstr("\t\t\t\t\t", 5, &buf, &buflen)); > - len =3D SPRINTF((tmp, "%lu", (unsigned long)t)); > + len =3D SPRINTF((tmp, "%lu", (unsigned long)t_local)); > T(addstr(tmp, len, &buf, &buflen)); > T(spaced =3D addtab(len, 16, spaced, &buf, &buflen)); > T(addstr("; serial\n", 9, &buf, &buflen)); > spaced =3D 0; >=20 > /* Refresh interval. */ > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > T(addstr("\t\t\t\t\t", 5, &buf, &buflen)); > - T(len =3D ns_format_ttl(t, buf, buflen)); > + T(len =3D ns_format_ttl(t_local, buf, buflen)); > addlen(len, &buf, &buflen); > T(spaced =3D addtab(len, 16, spaced, &buf, &buflen)); > T(addstr("; refresh\n", 10, &buf, &buflen)); > spaced =3D 0; >=20 > /* Retry interval. */ > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > T(addstr("\t\t\t\t\t", 5, &buf, &buflen)); > - T(len =3D ns_format_ttl(t, buf, buflen)); > + T(len =3D ns_format_ttl(t_local, buf, buflen)); > addlen(len, &buf, &buflen); > T(spaced =3D addtab(len, 16, spaced, &buf, &buflen)); > T(addstr("; retry\n", 8, &buf, &buflen)); > spaced =3D 0; >=20 > /* Expiry. */ > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > T(addstr("\t\t\t\t\t", 5, &buf, &buflen)); > - T(len =3D ns_format_ttl(t, buf, buflen)); > + T(len =3D ns_format_ttl(t_local, buf, buflen)); > addlen(len, &buf, &buflen); > T(spaced =3D addtab(len, 16, spaced, &buf, &buflen)); > T(addstr("; expiry\n", 9, &buf, &buflen)); > spaced =3D 0; >=20 > /* Minimum TTL. */ > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > T(addstr("\t\t\t\t\t", 5, &buf, &buflen)); > - T(len =3D ns_format_ttl(t, buf, buflen)); > + T(len =3D ns_format_ttl(t_local, buf, buflen)); > addlen(len, &buf, &buflen); > T(addstr(" )", 2, &buf, &buflen)); > T(spaced =3D addtab(len, 16, spaced, &buf, &buflen)); > @@ -276,15 +281,15 @@ ns_sprintrrf(const u_char *msg, size_t msglen, > case ns_t_mx: > case ns_t_afsdb: > case ns_t_rt: { > - u_int t; > + u_int t_local; >=20 > if (rdlen < NS_INT16SZ) > goto formerr; >=20 > /* Priority. */ > - t =3D ns_get16(rdata); > + t_local =3D ns_get16(rdata); > rdata +=3D NS_INT16SZ; > - len =3D SPRINTF((tmp, "%u ", (unsigned int)t)); > + len =3D SPRINTF((tmp, "%u ", (unsigned int)t_local)); > T(addstr(tmp, len, &buf, &buflen)); >=20 > /* Target. */ > @@ -294,15 +299,15 @@ ns_sprintrrf(const u_char *msg, size_t msglen, > } >=20 > case ns_t_px: { > - u_int t; > + u_int t_local; >=20 > if (rdlen < NS_INT16SZ) > goto formerr; >=20 > /* Priority. */ > - t =3D ns_get16(rdata); > + t_local =3D ns_get16(rdata); > rdata +=3D NS_INT16SZ; > - len =3D SPRINTF((tmp, "%u ", (unsigned int)t)); > + len =3D SPRINTF((tmp, "%u ", (unsigned int)t_local)); > T(addstr(tmp, len, &buf, &buflen)); >=20 > /* Name1. */ > @@ -503,33 +508,33 @@ ns_sprintrrf(const u_char *msg, size_t msglen, > } >=20 > case ns_t_sig: { > - u_int type, algorithm, labels, footprint; > + u_int type_local, algorithm, labels, footprint; > const char *leader; > - u_long t; > + u_long t_local; > int n; >=20 > if (rdlen < 22) > goto formerr; >=20 > /* Type covered, Algorithm, Label count, Original TTL. */ > - type =3D ns_get16(rdata); rdata +=3D NS_INT16SZ; > + type_local =3D ns_get16(rdata); rdata +=3D NS_INT16SZ; > algorithm =3D *rdata++; > labels =3D *rdata++; > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > len =3D SPRINTF((tmp, " %s %d %lu ", > - p_type((int)type), (int)algorithm, (unsigned long)t))= ; > + p_type((int)type_local), (int)algorithm, (unsigned > long)t_local)); > T(addstr(tmp, len, &buf, &buflen)); > if (labels !=3D (u_int)dn_count_labels(name)) > goto formerr; >=20 > /* Signature expiry. */ > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > - len =3D SPRINTF((tmp, "%s ", p_secstodate(t))); > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + len =3D SPRINTF((tmp, "%s ", p_secstodate(t_local))); > T(addstr(tmp, len, &buf, &buflen)); >=20 > /* Time signed. */ > - t =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > - len =3D SPRINTF((tmp, "%s ", p_secstodate(t))); > + t_local =3D ns_get32(rdata); rdata +=3D NS_INT32SZ; > + len =3D SPRINTF((tmp, "%s ", p_secstodate(t_local))); > T(addstr(tmp, len, &buf, &buflen)); >=20 > /* Signature Footprint. */ > diff --git a/StdLib/EfiSocketLib/Socket.c b/StdLib/EfiSocketLib/Socket.c > index ee15b62..5f91744 100644 > --- a/StdLib/EfiSocketLib/Socket.c > +++ b/StdLib/EfiSocketLib/Socket.c > @@ -5,7 +5,7 @@ > * Bound - pSocket->PortList is not NULL > * Listen - AcceptWait event is not NULL >=20 > - Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
> + Copyright (c) 2010 - 2024, Intel Corporation. All rights reserved.
> SPDX-License-Identifier: BSD-2-Clause-Patent >=20 >=20 > @@ -570,7 +570,7 @@ EslSocket ( > int ApiArraySize; > ESL_SOCKET * pSocket; > EFI_STATUS Status; > - int errno; > + int error_num; >=20 > DBG_ENTER ( ); >=20 > @@ -583,7 +583,7 @@ EslSocket ( > } >=20 > // Assume success > - errno =3D 0; > + error_num =3D 0; > Status =3D EFI_SUCCESS; >=20 > // Use break instead of goto > @@ -595,7 +595,7 @@ EslSocket ( > DEBUG (( DEBUG_ERROR | DEBUG_SOCKET, > "ERROR - Invalid domain value\r\n" )); > Status =3D EFI_INVALID_PARAMETER; > - errno =3D EAFNOSUPPORT; > + error_num =3D EAFNOSUPPORT; > break; > } >=20 > @@ -625,7 +625,7 @@ EslSocket ( > "ERROR - Invalid type value\r\n" )); > // The socket type is not supported > Status =3D EFI_INVALID_PARAMETER; > - errno =3D EPROTOTYPE; > + error_num =3D EPROTOTYPE; > break; > } >=20 > @@ -665,15 +665,15 @@ EslSocket ( > if ( ppApiArrayEnd <=3D ppApiArray ) { > DEBUG (( DEBUG_ERROR | DEBUG_SOCKET, > "ERROR - The protocol is not supported!\r\n" )); > - errno =3D EPROTONOSUPPORT; > + error_num =3D EPROTONOSUPPORT; > break; > } >=20 > // The driver does not support this protocol > DEBUG (( DEBUG_ERROR | DEBUG_SOCKET, > "ERROR - The protocol does not support this socket > type!\r\n" )); > - errno =3D EPROTONOSUPPORT; > - errno =3D EPROTOTYPE; > + error_num =3D EPROTONOSUPPORT; > + error_num =3D EPROTOTYPE; > break; > } > // Save the socket attributes > @@ -687,7 +687,7 @@ EslSocket ( > } > // Return the operation status > if ( NULL !=3D pErrno ) { > - *pErrno =3D errno; > + *pErrno =3D error_num; > } > DBG_EXIT_STATUS ( Status ); > return Status; > @@ -1334,7 +1334,7 @@ EslSocketClosePoll ( > IN int * pErrno > ) > { > - int errno; > + int error_num; > ESL_LAYER * pLayer; > ESL_SOCKET * pNextSocket; > ESL_SOCKET * pSocket; > @@ -1346,7 +1346,7 @@ EslSocketClosePoll ( > // > // Assume success > // > - errno =3D 0; > + error_num =3D 0; > Status =3D EFI_SUCCESS; >=20 > // > @@ -1401,7 +1401,7 @@ EslSocketClosePoll ( > // At least one port is still open > // > Status =3D EFI_NOT_READY; > - errno =3D EAGAIN; > + error_num =3D EAGAIN; > } > } > else { > @@ -1409,7 +1409,7 @@ EslSocketClosePoll ( > // SocketCloseStart was not called > // > Status =3D EFI_NOT_STARTED; > - errno =3D EPERM; > + error_num =3D EPERM; > } > break; > } > @@ -1428,7 +1428,7 @@ EslSocketClosePoll ( > // Socket not found > // > Status =3D EFI_NOT_FOUND; > - errno =3D ENOTSOCK; > + error_num =3D ENOTSOCK; > } >=20 > // > @@ -1440,7 +1440,7 @@ EslSocketClosePoll ( > // Return the operation status > // > if ( NULL !=3D pErrno ) { > - *pErrno =3D errno; > + *pErrno =3D error_num; > } > DBG_EXIT_STATUS ( Status ); > return Status; > @@ -1477,7 +1477,7 @@ EslSocketCloseStart ( > IN int * pErrno > ) > { > - int errno; > + int error_num; > ESL_PORT * pNextPort; > ESL_PORT * pPort; > ESL_SOCKET * pSocket; > @@ -1490,7 +1490,7 @@ EslSocketCloseStart ( > // Assume success > // > Status =3D EFI_SUCCESS; > - errno =3D 0; > + error_num =3D 0; >=20 > // > // Synchronize with the socket layer > @@ -1521,7 +1521,7 @@ EslSocketCloseStart ( > DEBUG_CLOSE | DEBUG_LISTEN | > DEBUG_CONNECTION ); > if (( EFI_SUCCESS !=3D Status ) > && ( EFI_NOT_READY !=3D Status )) { > - errno =3D EIO; > + error_num =3D EIO; > break; > } >=20 > @@ -1535,12 +1535,12 @@ EslSocketCloseStart ( > // Attempt to finish closing the socket > // > if ( NULL =3D=3D pPort ) { > - Status =3D EslSocketClosePoll ( pSocketProtocol, &errno ); > + Status =3D EslSocketClosePoll ( pSocketProtocol, &error_num ); > } > } > else { > Status =3D EFI_NOT_READY; > - errno =3D EAGAIN; > + error_num =3D EAGAIN; > } >=20 > // > @@ -1552,7 +1552,7 @@ EslSocketCloseStart ( > // Return the operation status > // > if ( NULL !=3D pErrno ) { > - *pErrno =3D errno; > + *pErrno =3D error_num; > } > DBG_EXIT_STATUS ( Status ); > return Status; > @@ -1889,7 +1889,7 @@ EslSocketFree ( > ) > { > EFI_HANDLE ChildHandle; > - int errno; > + int error_num; > ESL_LAYER * pLayer; > ESL_SOCKET * pSocket; > ESL_SOCKET * pSocketPrevious; > @@ -1901,7 +1901,7 @@ EslSocketFree ( > // > // Assume failure > // > - errno =3D EIO; > + error_num =3D EIO; > pSocket =3D NULL; > Status =3D EFI_INVALID_PARAMETER; >=20 > @@ -1986,7 +1986,7 @@ EslSocketFree ( > "0x%08x: Free pSocket, %d bytes\r\n", > pSocket, > sizeof ( *pSocket ))); > - errno =3D 0; > + error_num =3D 0; > } > else { > DEBUG (( DEBUG_ERROR | DEBUG_POOL, > @@ -2014,10 +2014,10 @@ EslSocketFree ( > } >=20 > // > - // Return the errno value if possible > + // Return the error_num value if possible > // > if ( NULL !=3D pErrno ) { > - *pErrno =3D errno; > + *pErrno =3D error_num; > } >=20 > // > @@ -2751,7 +2751,7 @@ EslSocketOptionGet ( > IN int * pErrno > ) > { > - int errno; > + int error_num; > socklen_t LengthInBytes; > socklen_t MaxBytes; > CONST UINT8 * pOptionData; > @@ -2763,7 +2763,7 @@ EslSocketOptionGet ( > // > // Assume failure > // > - errno =3D EINVAL; > + error_num =3D EINVAL; > Status =3D EFI_INVALID_PARAMETER; >=20 > // > @@ -2795,7 +2795,7 @@ EslSocketOptionGet ( > OptionName, > (CONST void ** > __restrict)&pOptionData, > &LengthInBytes ); > - errno =3D pSocket->errno; > + error_num =3D pSocket->errno; > break; > } > else { > @@ -2814,7 +2814,7 @@ EslSocketOptionGet ( > "ERROR - %a does not support any options!\r\n", > pSocket->pApi->pName )); > } > - errno =3D ENOPROTOOPT; > + error_num =3D ENOPROTOOPT; > Status =3D EFI_INVALID_PARAMETER; > break; >=20 > @@ -2825,7 +2825,7 @@ EslSocketOptionGet ( > // Socket option not supported > // > DEBUG (( DEBUG_INFO | DEBUG_OPTION, "ERROR - Invalid socket > option!\r\n" )); > - errno =3D EINVAL; > + error_num =3D EINVAL; > Status =3D EFI_INVALID_PARAMETER; > break; >=20 > @@ -2927,7 +2927,7 @@ EslSocketOptionGet ( > if ( LengthInBytes < MaxBytes ) { > ZeroMem ( &((UINT8 *)pOptionValue)[LengthInBytes], MaxBytes - > LengthInBytes ); > } > - errno =3D 0; > + error_num =3D 0; > Status =3D EFI_SUCCESS; > } > } > @@ -2936,7 +2936,7 @@ EslSocketOptionGet ( > // Return the operation status > // > if ( NULL !=3D pErrno ) { > - *pErrno =3D errno; > + *pErrno =3D error_num; > } > DBG_EXIT_STATUS ( Status ); > return Status; > @@ -2971,7 +2971,7 @@ EslSocketOptionSet ( > ) > { > BOOLEAN bTrueFalse; > - int errno; > + int error_num; > socklen_t LengthInBytes; > UINT8 * pOptionData; > ESL_SOCKET * pSocket; > @@ -2982,7 +2982,7 @@ EslSocketOptionSet ( > // > // Assume failure > // > - errno =3D EINVAL; > + error_num =3D EINVAL; > Status =3D EFI_INVALID_PARAMETER; >=20 > // > @@ -3015,7 +3015,7 @@ EslSocketOptionSet ( > OptionName, > pOptionValue, > OptionLength ); > - errno =3D pSocket->errno; > + error_num =3D pSocket->errno; > break; > } > else { > @@ -3034,7 +3034,7 @@ EslSocketOptionSet ( > "ERROR - %a does not support any options!\r\n", > pSocket->pApi->pName )); > } > - errno =3D ENOPROTOOPT; > + error_num =3D ENOPROTOOPT; > Status =3D EFI_INVALID_PARAMETER; > break; >=20 > @@ -3046,7 +3046,7 @@ EslSocketOptionSet ( > // > DEBUG (( DEBUG_OPTION, > "ERROR - Sockets does not support this option!\r\n" = )); > - errno =3D EINVAL; > + error_num =3D EINVAL; > Status =3D EFI_INVALID_PARAMETER; > break; >=20 > @@ -3133,7 +3133,7 @@ EslSocketOptionSet ( > // Set the option value > // > CopyMem ( pOptionData, pOptionValue, LengthInBytes ); > - errno =3D 0; > + error_num =3D 0; > Status =3D EFI_SUCCESS; > } > else { > @@ -3150,7 +3150,7 @@ EslSocketOptionSet ( > // Return the operation status > // > if ( NULL !=3D pErrno ) { > - *pErrno =3D errno; > + *pErrno =3D error_num; > } > DBG_EXIT_STATUS ( Status ); > return Status; > -- > 2.45.1.windows.1 -=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 (#119954): https://edk2.groups.io/g/devel/message/119954 Mute This Topic: https://groups.io/mt/107267145/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-