From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932158AbdK1Cj5 (ORCPT ); Mon, 27 Nov 2017 21:39:57 -0500 Received: from mail-sn1nam02on0089.outbound.protection.outlook.com ([104.47.36.89]:6814 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753408AbdK1Cjz (ORCPT ); Mon, 27 Nov 2017 21:39:55 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Yuri.Norov@cavium.com; From: Yury Norov To: Andy Whitcroft , Joe Perches , linux-kernel@vger.kernel.org Cc: Yury Norov Subject: [PATCH] checkpatch: suppress false long-line warining Date: Tue, 28 Nov 2017 05:39:38 +0300 Message-Id: <20171128023938.19872-1-ynorov@caviumnetworks.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [42.107.66.181] X-ClientProxiedBy: HE1P191CA0011.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::21) To DM5PR0701MB3832.namprd07.prod.outlook.com (2603:10b6:4:7f::30) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 460a4335-d22c-4612-ede1-08d536094db7 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:DM5PR0701MB3832; X-Microsoft-Exchange-Diagnostics: 1;DM5PR0701MB3832;3:dA5ziZWjRq28b3bUCYv8860FrbqqyB+EtosCVk197cAm/dPrthC4pCZTUf5Mwrtpd/0M+QsDonIx8loP85+S94qFXSfZewtF5lwwqkRGc07ixwVfaLo8ERY2Tz5p2IOpEPH5mM0rmxBUjdhZ6Ok6dBQqQuyWMkjmDfljkBWvxfpo1G0RshDKdYZBfbZLHzPlMqrLLmWRje0Ynj5sfFijeia9hFKQDCrLS3tz82Jhn5hE1saCcudLAsfxsuE2Q+B5;25:tT/vbtfXSqnN1H6aQAeX24yytTjF9ALDsrVoeUtaIud8lSwobXCUVX+sF1898EBkNvWHOkgomnqPeee3d2KO+k22wFJkNKouuxIhz8d0OqzKFdEiFx4/jzx6l3ZWgw0k9mG6rVUFyzp9M0zvKi0iGMnaCVBdy9eipJtNk7zcp8VoxGLvJfxMzxOyb/VGpbQt30Hixrc5gNy9w5sm9a2MYcQXb4qKKMn7vQT+gFZLM2+NLIp7VmyjSNyifDPYoaLOuc9d64EtsC5k+Sa5lQb2PZwZKSbpr1VYaAklpTKYRxtMg0pR3g7r+eN4VSXEGRC5Wjo74FsOSE7sYuvUSAB+AQ==;31:goW87cI7KpyeoLGsHAHP/sCz3HfxHn3KB7GrGS2n8rdntYWNSFtmlhPmmyzRG1jCoQ0B88+uiQvdxPqkeislsS4VPvAkcyvlrGzeDuyqzekPAdxDHAYdQwFJ0q3bJCqPrUPkoDHuIj8bl3RgSEd77KrmA08m6lYeE99wDIcTYZflrHK8nCCG4T1fcjl5d/QrDU4rwtTgEiLf++D++pRFxiVSU7yz/mzpiKKnN2VEH8k= X-MS-TrafficTypeDiagnostic: DM5PR0701MB3832: X-Microsoft-Exchange-Diagnostics: 1;DM5PR0701MB3832;20:D84Uhn2+kDm0iyDecWdOM+rJ4El3TOaX7xTKTWbg3wI9Qy1aVU7Se77vLSwDe0J1ZpPe2rvKV6z//zjbv+2UTiDTOb1xMO22b1/2NuhSr66ieAoYmRY/IcdkAf+Ee+FDJZwa7L8tf0MxbhqL7Cf++XMgu2Vc+W1Yd5n5C4tKevmyATymy6dsw+G94b2RHyl/dY4fXbg9x2MRMXfojbM47PaG8b1sTnUsg/5UH3W0l9ad/EQM+eEmWLWrxxWUPRXq8Pw7+jjqHg42+lu+oVTauxdTh5FU4Tfx18JSrSaHU61SZmFeDqC9kvCbLLnNyfpegpFJthEowPXsEjw/TlCGfKGx3aunAb3uhCEpJwm+I2ezU9Gy0psNAmrt+qaXC2Y0IqT5d/2sdJJf5ipvJfOc6+OrWgpzHwt6HlwwrRKvaAORSGLmY9eNlUEb5WaurIhrP4LXai4QzcY0m/7zRo0xY+A5gmTpQimnvF/8cCTPsudblyMpUhTufpaCw4pMEguWyPK23RauMW97XawcCvBY42V32ovfXGDAItZaAmWFV8bMdLyjY+4/yhpr8OMkjqM01GrtI2X8r+pUPz8xufR7cpG5F0VD1xflcuDl2OdTFM0=;4:Z3QyNzimE1ZwG3GUQASyB7lxBdeGLFPA8OXfbkz738kSRflrG6VC1hs9x5kFM0ELUbWdQ6oMPHBE0+wdOIv1VOYJLJkXN11hjHkNEx64gyf+AwlNHN6j6nfxc7suXenQdzphjNdBDHNn1i1ivs8amftx4seUdgDVVIIcqhSvzFK44KlzvFifKPOwuKhsv/jhn8bzyG18lzBjQvV6Ojt5C4ZvIIyP6pobvyCIbtZZnAlYw1Fca7XARNsVm1FO/iL8JS63HnaFJXus2/5sIEnwVQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(2401047)(8121501046)(5005006)(3231022)(93006095)(3002001)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123560025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR0701MB3832;BCL:0;PCL:0;RULEID:(100000803101)(100110400095);SRVR:DM5PR0701MB3832; X-Forefront-PRVS: 0505147DDB X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6069001)(6009001)(376002)(346002)(366004)(189002)(199003)(8676002)(305945005)(5009440100003)(81166006)(3846002)(47776003)(5660300001)(6666003)(42882006)(16526018)(101416001)(7736002)(51416003)(66066001)(316002)(8936002)(1076002)(50986999)(6496006)(6116002)(2906002)(97736004)(52116002)(16586007)(966005)(72206003)(25786009)(6306002)(50466002)(76506005)(478600001)(106356001)(36756003)(189998001)(105586002)(48376002)(50226002)(110136005)(53936002)(68736007)(81156014)(6486002)(4326008)(107886003)(33646002);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR0701MB3832;H:localhost;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM5PR0701MB3832;23:X0Zius9YwUYMGw/l2RCH0HyWyPO00dP5AJQzdS8?= =?us-ascii?Q?l2jVhXoR8capCyvs6JUy0L/vt5weKiHpJabrm7LcTsxVAvrdPmJe0l/GlZho?= =?us-ascii?Q?moYPQOX9fS/JuXMG4i7WLcDh4oZvQb+QUhCDeHSoo7I0lXW8hou2f4+KfZMf?= =?us-ascii?Q?/tcuDXT3hCWyq6GFntDhC9gizt19wIixLhVTPQy+nRPUU+nJ316r0/IbzCPT?= =?us-ascii?Q?OMmxgEePXe55EjEFzVKtFk2zSVbXe6Q0UR9fViJUvmCJhzaDEOQ+xTEmXy6F?= =?us-ascii?Q?GXMZTqaL+TH2hHNsCCP0HxXMSSFeS2+nOYIL25Qjk8pz7imR0QWbspMBBa+P?= =?us-ascii?Q?fNgdWvM7sSQ5I5lTQtuSEW3V26G3j/KXVGQf00z7+BE++1oylA60oSrw5Gs5?= =?us-ascii?Q?Qv7pdCu24D54nNH8VTIoTPvBUBalMaJEuJW2/WoEw0OntNRRi7qZniNYHap+?= =?us-ascii?Q?Xb2rjOs2TuNh4lasu9iMyZAI87JxmUODH6Gr4rAIHmmGFVd5405Wrd7rf/hO?= =?us-ascii?Q?Ddw3TTD4A7XoBOuFJ5UfqXzZw6JOkk1lav9NTO7WzC3UT7o4ttPn8NZSi/BX?= =?us-ascii?Q?iKNasUNUE0UVsojKhKSyayNb/p1UWi8JTcg0rwSN1gqs0CFLWdaO9nX/gazX?= =?us-ascii?Q?Bg+IPuNa4x5S4yc0fUSDr6Pq3kTf3zwDig+fQzLhSG/QMSPAsJjOIUJ8JW8s?= =?us-ascii?Q?vQpLZpybsoDJiecPZ8i76YNPL1Au6ESM0cLUsvqyk2BSzMnQpZn1DW1XU9Wz?= =?us-ascii?Q?eX8X4TiZYmN0Nv90nao5C/xIO7fy0P+YN7GlCBknPbOMslOFJSAy8z494ZlX?= =?us-ascii?Q?4RprzNyYzlXJ3QtvQXgW54gIstN+IyytmCwaM++STJRz6aS3aZrQsH6mHlxK?= =?us-ascii?Q?kPHt7Fx358fgefpsbSdirilbASOjud8/1CotPMdM99jZxKPqlYvLMU+OF9Th?= =?us-ascii?Q?qn3eUQFJXr+XWNKP4yExXMRTUdX1c3ff4kDmS8LVKQOhLfQgaLTKCvXV5ytn?= =?us-ascii?Q?fcjDBGiGPyC6Qnu8u04Y4f+vtuH81Uo4jKF0gcgH9Qv8eAfNKvY+HtbEwrn5?= =?us-ascii?Q?e77FJuu70Gv0Ot+EaQKqGwjsnKXzYTwrxrTw/jWyknb4I5IpG1bc3TE4rBRv?= =?us-ascii?Q?MmKNg3rb+G8kgkEM14VGnys0Q3HdEdz1SWpnsqzXuloLCdesuJTdoknRNzMI?= =?us-ascii?Q?qN6dEuYqKnzOsmC86X2s4rQzxSmb67P4wKP+d?= X-Microsoft-Exchange-Diagnostics: 1;DM5PR0701MB3832;6:z+yplWfvMIHC4yncF3TWa8XLkPxFJpjFQTHQC3IODfYIPI+UeiasUjXc/W561iuagelxnYqVMATi90QGtz57OR5o1nMNVXruqaNj/EQ2IgFk8OnETDfwSI2HjSxvYZS9ljPFrySC7esLTuunmSMcC/CxWkZhdwI4c94iPEOG26h4woHQb99Kxl690f/FhKu42j/9OiETzitoYaWwSnHctLqTjbQxE2iIPuNBR3Y+nocFmuugsJA6bRX6AgLfH987bmSx+eBtKj2F5JkbAvaOAozZtw6FMSe2aNHqpTM0V7Oacxb8pD3zWtAr0mUPCxWCzytOlORRJkPN9sPi7PUsuWkZj4RzbB7frjjewEHn1FU=;5:bfBBfOsyg0YOP08gMqzkr6BISjR2N+ou1aMatQp3dXe+bMMBXEAtkb4IUKiuUibG2xLFM2YTD78MIYHHGtqNU3KSJI2y8of1QhWgEGXzNhyl2KIFf6RcscJr9XqnWX1+w8Rtag7sxmWu5AGrlC/knxpukrQLBYaboS58ag0iwkk=;24:JDtS2IIbG2eZ5IlIslNkFg8fO+R8hYBfMsYtYyAz/jI+5cexjhaRlehQnGg1oO752b63dBLve4gzKiWopy7bY2FJVLEa8BgseDXi/XCqYUs=;7:eb2muXAN13P+MIVYFADxNbOE+pw7hWXB1fCiucEsRRnr221jLONTL0NBBgQO6urZ8iuplxm34iJxmDWnDrWWwf6s2hzz/gofdhm1f7JrMJ7kFNX+XJTzWOlWKEhQR0onmztgmjJqy1q0H+SqLO8D2tzROFV0YNHaJfQmbN73MhzynspPlinH3hxaGeOgmHKF1WKMyja4hCJTPo23x7nnwCF0AbJY9Df1mOWPWARpqBVDpfgLV4BUvn+blMBvbIQy SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2017 02:39:51.9298 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 460a4335-d22c-4612-ede1-08d536094db7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR0701MB3832 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For DOS-formatted patches, extra ^M symbol at the end of line increases overall line length by 1. It triggers unneeded warning if line is exactly 80 chars length. This patch fixes it. Discovered in discussion to this patch: https://lkml.org/lkml/2017/11/25/24 Signed-off-by: Yury Norov --- scripts/checkpatch.pl | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 95cda3ecc66b..a14d36f7df13 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -59,6 +59,7 @@ my $conststructsfile = "$D/const_structs.checkpatch"; my $typedefsfile = ""; my $color = "auto"; my $allow_c99_comments = 1; +my $is_dos_line; sub help { my ($exitcode) = @_; @@ -2731,7 +2732,9 @@ sub process { next if (!$hunk_line || $line =~ /^-/); #trailing whitespace + $is_dos_line = 0; if ($line =~ /^\+.*\015/) { + $is_dos_line = 1 if (!$fix_inplace); my $herevet = "$here\n" . cat_vet($rawline) . "\n"; if (ERROR("DOS_LINE_ENDINGS", "DOS line endings\n" . $herevet) && @@ -2884,7 +2887,12 @@ sub process { # if LONG_LINE is ignored, the other 2 types are also ignored # - if ($line =~ /^\+/ && $length > $max_line_length) { + # If DOS line detected, additional ^M symbol at the end of + # line increases line length, so increase max_line_length + # accordingly. + my $__max_line_length = $max_line_length + $is_dos_line; + + if ($line =~ /^\+/ && $length > $__max_line_length) { my $msg_type = "LONG_LINE"; # Check the allowed long line types first @@ -2892,7 +2900,7 @@ sub process { # logging functions that end in a string that starts # before $max_line_length if ($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(?:KERN_\S+\s*|[^"]*))?($String\s*(?:|,|\)\s*;)\s*)$/ && - length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $max_line_length) { + length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $__max_line_length) { $msg_type = ""; # lines with only strings (w/ possible termination) @@ -2910,12 +2918,12 @@ sub process { # a comment starts before $max_line_length } elsif ($line =~ /($;[\s$;]*)$/ && - length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $max_line_length) { + length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $__max_line_length) { $msg_type = "LONG_LINE_COMMENT" # a quoted string starts before $max_line_length } elsif ($sline =~ /\s*($String(?:\s*(?:\\|,\s*|\)\s*;\s*))?)$/ && - length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $max_line_length) { + length(expand_tabs(substr($line, 1, length($line) - length($1) - 1))) <= $__max_line_length) { $msg_type = "LONG_LINE_STRING" } -- 2.11.0