From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web08.3271.1616031247386069406 for ; Wed, 17 Mar 2021 18:34:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Ig8AFO0E; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: bob.c.feng@intel.com) IronPort-SDR: Gx3xGtA3KZR2wgh5wVcWgZitpd8ndkLfKSNReoro8foEsje8KyHLTETuFAFGnFRrGrDbeQQMyx AbwSs+9e7pNA== X-IronPort-AV: E=McAfee;i="6000,8403,9926"; a="187214697" X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="187214697" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Mar 2021 18:34:06 -0700 IronPort-SDR: aBylIIbNEvukrCf+fboQYSfgzTmjHkSBq/I6zdp0yJR5iHVn3y3mWS+M1roKTQtdJJxMVeh6Tp r+u3Ux++oxeQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,257,1610438400"; d="scan'208";a="374372722" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga006.jf.intel.com with ESMTP; 17 Mar 2021 18:34:06 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 17 Mar 2021 18:34:06 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 17 Mar 2021 18:34:05 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Wed, 17 Mar 2021 18:34:05 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.102) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Wed, 17 Mar 2021 18:34:05 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ARx9K+Gds7I2dMgVvlh0UT/QA09PFzDBS7EGhTtckk9jcWvXAWTjUwo7+e2Ygzpu7dQe3ReyysQ4fMhH30gblsPB8XEulecH4MxnP3b4iwjfAqCHk2KV3pG0QjyWkikIIOfO0lqUICFZk4H72tM8DKKRPXoQiomQoqtEBNswhIO+i3cV7KvoUVHnsndJLXeYV2Ue9RbkKFlu7aU/riHqf/IcDHPbPu7lGgFY5Gj3Go0AfnR1AcpOr7tnSsqK2KsaBfYowN/vIRj8MbFIFzQ8l9IasObpfhMBe8uD69YF/MxT0lgj/6AGkmpm2PEPQMoSu8ens2UlnXVO/mfsAPe5yw== 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-SenderADCheck; bh=cmoR08vp2oa89p6Gme0qHOHXv2iK48fJWIQkdfjbE6k=; b=ZJUY9ZkjtnaO/hEDS1dsW+I427kQbbRb4LNTWPjr9Rx/cGSI137JwLInQi4yY5Janyp+XlzOW2SAvjr4whMrsk1VLE2BjkxceoGmL89cdoyHSaxS1IxGuRaA33dN+vFf+gBOD90/mtQufoCAXX8tXwOfxq/uS0tqODlUyHgNI5n15Hqo046Nej3UzKdjjwrrTEpbLynCRzA5zKcdXBtPB0FdeXI8ie4ZK6C23o9LMksX+UdwHn8NhNEDjxGekHnpgr1uuS/0RIZD69NNLTAw30RKpyo6qCBOB6Ja+w8st3geYsiZMWzcONgeuiBW7RvVLB85EsuObTYDo3yTYw6xdA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cmoR08vp2oa89p6Gme0qHOHXv2iK48fJWIQkdfjbE6k=; b=Ig8AFO0EfZ8FawVCVfoB6B8jB8Uzd4BK/nhnnkUyuOugyPJ6RnW7bxn34FPP+aP9WgqAxbbXoIGPdzne3Y56YDKOp3iKltWfMPN5wd09P1n0G00LVA+2CeJMw3fvZOtsVlOwPfKgLgSYDz5JiHyvzoVU0oFugPMK4u8Y8XnQO+Q= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB4441.namprd11.prod.outlook.com (2603:10b6:5:200::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Thu, 18 Mar 2021 01:34:04 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::10db:5760:d7f5:d0e0]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::10db:5760:d7f5:d0e0%3]) with mapi id 15.20.3955.018; Thu, 18 Mar 2021 01:34:04 +0000 From: "Bob Feng" To: "Pierre.Gondois@arm.com" , "devel@edk2.groups.io" , "gaoliming@byosoft.com.cn" , "Chen, Christine" Subject: Re: [PATCH v3 1/1] BaseTools/Ecc: Make Ecc only check first include guard Thread-Topic: [PATCH v3 1/1] BaseTools/Ecc: Make Ecc only check first include guard Thread-Index: AQHXGxRINzYar7g+ikiqhI3DRdgpQ6qI91Fw Date: Thu, 18 Mar 2021 01:34:04 +0000 Message-ID: References: <20210317095937.26869-1-Pierre.Gondois@arm.com> In-Reply-To: <20210317095937.26869-1-Pierre.Gondois@arm.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.46.54] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ddbfbead-da08-44be-cf5b-08d8e9adea6d x-ms-traffictypediagnostic: DM6PR11MB4441: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2657; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: EgHHm5AOXMNi5u1XA45jUrS5389ITMSbTx01gsBSxzdJlABpBz0gX8Xc3ynbSI+H7UBlD87MsEsYhykISsuaeccp3rFI1cWD+kkfAqXyBRzXsxuNw5pdSkEViH7hqVkjdU3dLtepJr27bFJwQDp28v7YW4+htvbDXrNIoXZ+o4VKYXPi7J5zMHlPBGTIfMBh6cSZvSc9uGU8F0duhEVt1CXbV7QeZT+bk5Z3O1UIZxKccZlq5U8e89hVZhkkzD6WFxKhHUKcJP/gXZcKUASR7NxmlynAxLlDM0SYsy4mSAc64WCLPD/0HnwdHJtOOVQrV6Xrz480WEzPKNQgCXqCXTTWBgQiOsoNHJkhcHYfdXaxhcw7riXEVQ5PRRaL3vsNOPnXN5vFD0CU9U4yQUGszRqkuh6n3aw3hGz86ajwLEk+l35BpiX4R/3c/5zvvPsmk5a68tdXthDZfqNxRuvm+w9cfT3/iTDmIeC4vmfcO8ljG2ionVkjKecj0zL8OK1codQQVBk6+SUOPA6HrieqaOnPXvVK1aJZKIuQCSkgRwOHZLkSB+mRosETqGK8Ldc2d+Ii/4AjYEWsl3+5TPzVRQS877wwG1lKClpW5gbNXts8OkA4+kZioJ2vPNm5S8bqqCtb6JpfQ9zj4zA+KxQiVA9vgtA9MwyJu6sxF5GWJiRucmva2K+H6Dih0YYFM+NgmaVPhfdDt7aYU65g2hoM8w== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(136003)(39860400002)(376002)(346002)(366004)(396003)(6636002)(33656002)(66946007)(7696005)(55016002)(76116006)(5660300002)(66476007)(66556008)(38100700001)(64756008)(110136005)(316002)(478600001)(53546011)(6506007)(8676002)(26005)(83380400001)(8936002)(9686003)(66446008)(86362001)(52536014)(2906002)(186003)(71200400001)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?pfxbTWkc/u/thm+HM9wmNZCC7PE7KNkHHcJxGjMZhRjxWSXKekovESHKXr2K?= =?us-ascii?Q?2itHaXGLJyWLFQ8UksbQyrJS4/1JZV6hz0jV2knbUskivU8+NP5mvAEW6fid?= =?us-ascii?Q?bne5PljPOq0zGlllIBUj5D3za2zsBLK+4EduB+1/MPFFAbvoFUoCV2wRxF35?= =?us-ascii?Q?PemGTD4UHIPxJ5zcoAZW4/zNhMtKwbhxSR2XZXvqE1CdJoS4M0JfG2GEPdiG?= =?us-ascii?Q?J9r4M1f6U+fUhflS7l2RnKbQ+2hzUspu2uJupqmyDlFbHwZjIdYRhk4f6bP2?= =?us-ascii?Q?UdIDjNhuObeRUPqJgchRcZtI5E5DpZ5CuS7MBwnex816R1Bj49A90DfIWFsg?= =?us-ascii?Q?J6w1INtfRHSou9VLU7tqvm4F8rDlMzV+7/uDQGS1+R5rNo3+eSIqAAbegRfU?= =?us-ascii?Q?soqu5m379VM/RcsmyGGn+7ib+qpb6wXWn2ZT6FwkcirxF2TZK6Unvi079UTU?= =?us-ascii?Q?Ruh2EoKRjdgZrcfIK68TghceiQR2YFj20RXm8cE2aBjiOn3rOFZCdjua8pQS?= =?us-ascii?Q?H3Q4JDaZ8xETaXM4O4UjMw7pQOU6WQNtn7S6lOC1+jV4/E1jIFX7OXuK9PJo?= =?us-ascii?Q?VerB/n6pEVsYxNz4xftRF1Ts/whZGxajsn0JUEL0nbzLJLJrOS1VQDfaOJCW?= =?us-ascii?Q?rdvQhbKbm9hAmUCSyAooxXZexUDmlDrxb/2vvqgI+Ax3mdI/3RSasryh6W+g?= =?us-ascii?Q?aor/QZFg11/Eb4/1SQg5lN6OmnqSGX6aBr2pE/2POYEDzXIOLDERWori5TdD?= =?us-ascii?Q?7mcPRjliRjxhqEY2z1mO1FbiA92kJ8l4mDfJy+6KqNS/1iixOh15W3q1bIrU?= =?us-ascii?Q?JtnmKq1WKueKyeyZ9A8j3PI8qNfnL+SC55t1rCBjLCMo4Y2b4lVkKJuw+UcZ?= =?us-ascii?Q?CFVtFJfZVvEBjntMra2LxG3fQC7GG9HOkt7Q2KozgDI66tQKKNfL/Vo4zdyT?= =?us-ascii?Q?5JMW/ljcCOxRMXSUdX71L+kGnWe1VUQX7AtA5jvMfnrZQMRKxQh8VRQe+4tx?= =?us-ascii?Q?WYWwNTmdCZHRTiVqumWitZ32IDyRJ2JFpVZvOMceFMuglIyUvqyFd6oANUVG?= =?us-ascii?Q?vtieFV7Oh8eun4H021dTKKRGQKR904T9aJBhDOAi0aYM6lfjUk5eH2Tth+Rw?= =?us-ascii?Q?JtfjUvJb5NHL7CbfXfM5n1ySz51/IiaWw5ZUk9e6Kii5sesNyBq6HGxZ+Fm2?= =?us-ascii?Q?+W8sDgn1cyrUMUaLvumO4T2wEFrJ2yHSP6jrMmkZRpFx1Q384yYZEYkKF6yT?= =?us-ascii?Q?ozBI6SjP7UYgOibfHwfr1uCW7r9l1FN2b7NA0dtWn/bmBIbn2LfmvMcfXx7S?= =?us-ascii?Q?xSs=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ddbfbead-da08-44be-cf5b-08d8e9adea6d X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Mar 2021 01:34:04.3334 (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: vZfJ7lnTaDWYj7smf6wAd09v/OMtAvB1v0djaG7To0H4I9YwLgh/ApiKM67xlO+O3lvNpuBzsTCk0GZ99W5VVA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4441 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Create a PR https://github.com/tianocore/edk2/pull/1500 Thanks, Bob -----Original Message----- From: Pierre.Gondois@arm.com =20 Sent: Wednesday, March 17, 2021 6:00 PM To: devel@edk2.groups.io; Feng, Bob C ; gaoliming@byo= soft.com.cn; Chen, Christine Subject: [PATCH v3 1/1] BaseTools/Ecc: Make Ecc only check first include gu= ard From: Pierre Gondois The Ecc tool checks the format of the include guard. This check is currentl= y done on all the names following the '#ifndef' statement. It should only be done on the first include guard. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3252 Signed-off-by: Pierre Gondois Reviewed-by: Liming Gao Reviewed-by: Bob Feng --- The changes can be seen at: https://github.com/PierreARM/edk2/tree/1640_Ecc= _tool_corrections_v3 Notes: v2: - Remove duplicated copyright. - Add Bob Feng's reviewed-by. - Add Liming Gao's reviewed-by (resend). =20 v3: - Correct bad formatting of patch (not-possible to apply the patch). [Bob] BaseTools/Source/Python/Ecc/Check.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Ecc/Check.py b/BaseTools/Source/Python= /Ecc/Check.py index 7a012617fd35..33060db5f27a 100644 --- a/BaseTools/Source/Python/Ecc/Check.py +++ b/BaseTools/Source/Python/Ecc/Check.py @@ -1437,11 +1437,13 @@ class Check(object): =20 SqlCommand =3D """select ID, Value from %s where Model =3D %s"= "" % (FileTable, MODEL_IDENTIFIER_MACRO_IFNDEF) RecordSet =3D EccGlobalData.gDb.TblFile.Exec(SqlCommand) - for Record in RecordSet: - Name =3D Record[1].replace('#ifndef', '').strip() + if RecordSet: + # Only check the first ifndef statement of the file + FirstDefine =3D sorted(RecordSet, key=3Dlambda Record: Rec= ord[0])[0] + Name =3D FirstDefine[1].replace('#ifndef', '').strip() if Name[0] =3D=3D '_' or Name[-1] !=3D '_' or Name[-2] =3D= =3D '_': if not EccGlobalData.gException.IsException(ERROR_NAMI= NG_CONVENTION_CHECK_IFNDEF_STATEMENT, Name): - EccGlobalData.gDb.TblReport.Insert(ERROR_NAMING_CO= NVENTION_CHECK_IFNDEF_STATEMENT, OtherMsg=3D"The #ifndef name [%s] does not= follow the rules" % (Name), BelongsToTable=3DFileTable, BelongsToItem=3DRe= cord[0]) + =20 + EccGlobalData.gDb.TblReport.Insert(ERROR_NAMING_CONVENTION_CHECK_IFNDE + F_STATEMENT, OtherMsg=3D"The #ifndef name [%s] does not follow the=20 + rules" % (Name), BelongsToTable=3DFileTable,=20 + BelongsToItem=3DFirstDefine[0]) =20 # Rule for path name, variable name and function name # 1. First character should be upper case -- 2.17.1