All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joe Perches <joe@perches.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Whitcroft <apw@canonical.com>,
	Dan Carpenter <dan.carpenter@oracle.com>,
	Julia Lawall <julia.lawall@lip6.fr>,
	linux-kernel@vger.kernel.org
Subject: [PATCH V2] checkpatch: Categorize some long line length checks
Date: Sat, 23 May 2015 19:49:41 -0700	[thread overview]
Message-ID: <1432435781.2846.13.camel@perches.com> (raw)
In-Reply-To: <1432402012.29657.52.camel@perches.com>

Many lines of code extend beyond the maximum line length.
Some of these are possibly justified by use type.

For instance:

structure definitions where comments are added per member like:
struct foo {
	type member;		/* some long description */

And lines that don't fit the typical logging message style
where a string constant is used like:

        SOME_MACRO(args, "Some long string");

Categorize these long line types so that checkpatch can use a
command-line --ignore=<type> option to avoid emitting some long
line warnings.

One of the existing checkpatch exclusions allowed kernel-doc
argument documentation to exceed 80 columns because old versions
of kernel-doc required single line documentation.  The requirement
was removed in 2009 so remove that exclusion.

Add documentation to make the test a bit clearer.

Signed-off-by: Joe Perches <joe@perches.com>
---
 scripts/checkpatch.pl | 60 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 89b1df4..a5d2d11 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2510,16 +2510,56 @@ 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|dtsi|dts)$/);
 
-#line length limit
-		if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
-		    $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
-		    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?$String\s*(?:|,|\)\s*;)\s*$/ ||
-		      $line =~ /^\+\s*$String\s*(?:\s*|,|\)\s*;)\s*$/ ||
-		      $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) &&
-		    $length > $max_line_length)
-		{
-			WARN("LONG_LINE",
-			     "line over $max_line_length characters\n" . $herecurr);
+# line length limit (with some exclusions)
+#
+# There are a few types of lines that may extend beyond $max_line_length:
+#	logging functions like pr_info that end in a string
+#	lines with a single string
+#	#defines that are a single string
+#
+# There are 3 different line length message types:
+# LONG_LINE_COMMENT	a comment starts before but extends beyond $max_linelength
+# LONG_LINE_STRING	a string starts before but extends beyond $max_line_length
+# LONG_LINE		all other lines longer than $max_line_length
+#
+# if LONG_LINE is ignored, the other 2 types are also ignored
+#
+
+		if ($length > $max_line_length) {
+			my $msg_type = "LONG_LINE";
+
+			# Check the allowed long line types first
+
+			# 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) {
+				$msg_type = "";
+
+			# lines with only strings (w/ possible termination)
+			# #defines with only strings
+			} elsif ($line =~ /^\+\s*$String\s*(?:\s*|,|\)\s*;)\s*$/ ||
+				 $line =~ /^\+\s*#\s*define\s+\w+\s+$String$/) {
+				$msg_type = "";
+
+			# Otherwise set the alternate message types
+
+			# a comment starts before $max_line_length
+			} elsif ($line =~ /($;[\s$;]*)$/ &&
+				 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) {
+				$msg_type = "LONG_LINE_STRING"
+			}
+
+			if ($msg_type ne "" &&
+			    (show_type("LONG_LINE") || show_type($msg_type))) {
+				WARN($msg_type,
+				     "line over $max_line_length characters\n" . $herecurr);
+			}
 		}
 
 # check for adding lines without a newline.



  parent reply	other threads:[~2015-05-24  2:49 UTC|newest]

Thread overview: 125+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-21 19:50 [PATCH v4 00/13] staging: lustre: lnet: code cleanups Mike Shuey
2015-05-21 19:50 ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 01/13] staging: lustre: lnet: lnet: code cleanups - variable declarations Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 02/13] staging: lustre: lnet: dead code - remove lnet_fini_locks Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 03/13] staging: lustre: lnet: dead code - remove LNetSetAsync Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 04/13] staging: lustre: lnet: lnet: Module is LNet, not Portals Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 05/13] staging: lustre: lnet: o2iblnd: code cleanup - align whitespace Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-22 13:03   ` Dan Carpenter
2015-05-22 13:03     ` Dan Carpenter
2015-05-21 19:50 ` [PATCH v4 06/13] staging: lustre: lnet: socklnd: code cleanup - align spacing Mike Shuey
2015-05-21 19:50 ` [PATCH v4 07/13] staging: lustre: lnet: selftest: code cleanup - variable spacing, indentation Mike Shuey
2015-05-21 19:50 ` [PATCH v4 08/13] staging: lustre: lnet: remove LNET_MUTEX_LOCK macro Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 09/13] staging: lustre: lnet: lnet: remove dead code, fix checkpatch.pl issue Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 10/13] staging: lustre: lnet: lnet: checkpatch.pl fixes Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 21:00   ` Joe Perches
2015-05-21 21:00     ` Joe Perches
2015-05-21 21:29     ` Julia Lawall
2015-05-21 21:29       ` Julia Lawall
2015-05-21 22:04       ` [lustre-devel] " Michael Shuey
2015-05-22  2:46         ` Joe Perches
2015-05-22  2:46           ` Joe Perches
2015-05-22  2:46           ` [lustre-devel] " Joe Perches
2015-05-22  5:06         ` Julia Lawall
2015-05-22  5:06           ` Julia Lawall
2015-05-22  5:06           ` [lustre-devel] " Julia Lawall
2015-05-22  8:08           ` Drokin, Oleg
2015-05-22  8:08             ` [lustre-devel] " Drokin, Oleg
2015-05-22 15:42             ` Joe Perches
2015-05-22 15:42               ` Joe Perches
2015-05-22 15:42               ` [lustre-devel] " Joe Perches
2015-05-22 21:16               ` Drokin, Oleg
2015-05-22 21:16                 ` [lustre-devel] " Drokin, Oleg
2015-05-22 23:57                 ` Joe Perches
2015-05-22 23:57                   ` Joe Perches
2015-05-22 23:57                   ` [lustre-devel] " Joe Perches
2015-05-23  0:07                   ` Drokin, Oleg
2015-05-23  0:07                     ` [lustre-devel] " Drokin, Oleg
2015-05-23  0:18                     ` Joe Perches
2015-05-23  0:18                       ` Joe Perches
2015-05-23  0:18                       ` [lustre-devel] " Joe Perches
2015-05-23  0:25                       ` Drokin, Oleg
2015-05-23  0:25                         ` [lustre-devel] " Drokin, Oleg
2015-05-23  0:36                         ` Joe Perches
2015-05-23  0:36                           ` Joe Perches
2015-05-23  0:36                           ` [lustre-devel] " Joe Perches
2015-05-23  3:13                           ` [HPDD-discuss] " Patrick Farrell
2015-05-23  3:13                             ` [lustre-devel] " Patrick Farrell
     [not found]     ` <CABqvwjs=S1VrCHe7M4JnDikGBVN3yqjNMrtSA=UvftGmxSasRQ@mail.gmail.com>
2015-05-22  3:06       ` Joe Perches
2015-05-22  3:06         ` Joe Perches
2015-05-22  8:04       ` Drokin, Oleg
2015-05-22 10:00         ` Julia Lawall
2015-05-22 10:00           ` Julia Lawall
2015-05-23  6:28     ` [PATCH] checkpatch: Categorize some long line length checks Joe Perches
2015-05-23  6:28       ` Joe Perches
2015-05-23 11:32       ` Julia Lawall
2015-05-23 11:32         ` Julia Lawall
2015-05-23 17:26         ` Joe Perches
2015-05-23 17:26           ` Joe Perches
2015-05-23 18:07           ` Dan Carpenter
2015-05-23 18:07             ` Dan Carpenter
2015-05-23 18:13             ` Joe Perches
2015-05-23 18:13               ` Joe Perches
2015-05-23 18:21               ` Dan Carpenter
2015-05-23 18:21                 ` Dan Carpenter
2015-05-24  2:49           ` Joe Perches [this message]
2015-05-21 19:50 ` [PATCH v4 11/13] staging: lnet: o2iblnd: checkpatch.pl fixes Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-22 10:49   ` Dan Carpenter
2015-05-22 10:49     ` Dan Carpenter
2015-05-21 19:50 ` [PATCH v4 12/13] staging: lustre: lnet: socklnd: checkpatch.pl cleanups Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH v4 13/13] staging: lustre: lnet: selftest: checkpatch.pl fixes Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 01/13] staging: lustre: lnet: lnet: code cleanups - variable declarations Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 02/13] staging: lustre: lnet: dead code - remove lnet_fini_locks Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 03/13] staging: lustre: lnet: dead code - remove LNetSetAsync Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 04/13] staging: lustre: lnet: lnet: Module is LNet, not Portals Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 05/13] staging: lustre: lnet: o2iblnd: code cleanup - align whitespace Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 06/13] staging: lustre: lnet: socklnd: code cleanup - align spacing Mike Shuey
2015-05-21 19:50 ` [PATCH 07/13] staging: lustre: lnet: selftest: code cleanup - variable spacing, indentation Mike Shuey
2015-05-21 19:50 ` [PATCH 08/13] staging: lustre: lnet: remove LNET_MUTEX_LOCK macro Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 09/13] staging: lustre: lnet: lnet: remove dead code, fix checkpatch.pl issue Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 10/13] staging: lustre: lnet: lnet: checkpatch.pl fixes Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 11/13] staging: lnet: o2iblnd: " Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 12/13] staging: lustre: lnet: socklnd: checkpatch.pl cleanups Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-21 19:50 ` [PATCH 13/13] staging: lustre: lnet: selftest: checkpatch.pl fixes Mike Shuey
2015-05-21 19:50   ` Mike Shuey
2015-05-22 10:55   ` Dan Carpenter
2015-05-22 10:55     ` Dan Carpenter
2015-05-22  9:21 ` [PATCH v4 00/13] staging: lustre: lnet: code cleanups Dan Carpenter
2015-05-22  9:21   ` Dan Carpenter
2015-05-22 22:48   ` [lustre-devel] " Michael Shuey
2015-05-23 10:14     ` Dan Carpenter
2015-05-23 10:14       ` Dan Carpenter
2015-05-23 10:14       ` [lustre-devel] " Dan Carpenter
2015-05-23 12:09       ` Michael Shuey
2015-05-23 12:09         ` Michael Shuey
2015-05-23 12:09         ` [lustre-devel] " Michael Shuey
2015-05-23 12:39         ` Sudip Mukherjee
2015-05-23 12:51           ` Sudip Mukherjee
2015-05-23 12:39           ` Sudip Mukherjee
2015-05-23 14:05           ` Michael Shuey
2015-05-23 14:05             ` Michael Shuey
2015-05-23 14:05             ` [lustre-devel] " Michael Shuey
2015-05-31  2:24             ` Greg KH
2015-05-31  2:24               ` Greg KH
2015-05-31  2:24               ` [lustre-devel] " Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1432435781.2846.13.camel@perches.com \
    --to=joe@perches.com \
    --cc=akpm@linux-foundation.org \
    --cc=apw@canonical.com \
    --cc=dan.carpenter@oracle.com \
    --cc=julia.lawall@lip6.fr \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.