Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751131AbZLRFM2 (ORCPT ); Fri, 18 Dec 2009 00:12:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750884AbZLRFM1 (ORCPT ); Fri, 18 Dec 2009 00:12:27 -0500 Received: from mail.perches.com ([173.55.12.10]:1266 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750781AbZLRFM1 (ORCPT ); Fri, 18 Dec 2009 00:12:27 -0500 Subject: [PATCH] scripts/checkpatch.pl: Change long line warning to 105 chars From: Joe Perches To: Valdis.Kletnieks@vt.edu, Andy Whitcroft , Andrew Morton Cc: Mikulas Patocka , Krzysztof Halasa , Paul Mundt , linux-kernel@vger.kernel.org, Linus Torvalds , Alasdair G Kergon , dm-devel@redhat.com In-Reply-To: <24653.1261110557@localhost> References: <20091217061229.GD3946@linux-sh.org> <24653.1261110557@localhost> Content-Type: text/plain; charset="UTF-8" Date: Thu, 17 Dec 2009 21:12:24 -0800 Message-ID: <1261113144.13734.317.camel@Joe-Laptop.home> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1863 Lines: 51 On Thu, 2009-12-17 at 23:29 -0500, Valdis.Kletnieks@vt.edu wrote: > Yeah, but I respectfully submit that if the regexp '^\t{6}' matches a non- > continuation line, it's probably in its rights to whinge. > grep -r -P '^\t{7:}(?!(.*,$|.*\);$))' . | more > produces a whole lot of "this can't end well" output. I think this is a good test to add to checkpatch. Add 105 character long line WARN test Add 80 character long line STRICT test Add 6+ leading indent tabs test, consider restructuring Signed-off-by: Joe Perches diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index bc4114f..c358251 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1374,13 +1374,20 @@ sub process { # check we are in a valid source file if not then ignore this hunk next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/); -#80 column limit +#Line too long if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ && $rawline !~ /^.\s*\*\s*\@$Ident\s/ && - $line !~ /^\+\s*printk\s*\(\s*(?:KERN_\S+\s*)?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ && - $length > 80) - { - WARN("line over 80 characters\n" . $herecurr); + $line !~ /^\+\s*printk\s*\(\s*(?:KERN_\S+\s*)?"[X\t]*"\s*(?:,|\)\s*;)\s*$/) { + if ($length > 105) { + WARN("line over 105 characters\n" . $herecurr); + } elsif ($length > 80) { + CHK("line over 80 characters\n" . $herecurr); + } + } + +#too many leading tabs - deep leading indent + if ($line =~ /^\+ {6,}(?!(.*,$|.*\);$))/) { + CHK("Too many leading tabs. Consider restructuring code\n" . $herecurr); } # check for adding lines without a newline. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/