Skip to contentSkip to conversation

checkpatch: Handle long multi-line macros better

PATCH In review Prakruthi Deepak Heragu 2 participants 2 messages Jul 10, 2018 Checkpatch

lore
Share & tools
lore

Prakruthi Deepak Heragu

author
#0 lore raw

PATCH 1/1 checkpatch: Handle long multi-line macros better

Currently, the checkpatch throws an error on long macro expressions which is more than one line i.e the opening and the closing bracket pair not being on the same line. This patch gives the dangling backslash the benefit of doubt and allows it to consider the closing paranthesis on the next line as part of the macro expression and doesn't throw an error.

Signed-off-by Prakruthi Deepak Heragu <[email protected]>
---
 scripts/checkpatch.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/checkpatch.pl +6 -1
index 599ae61..158c96d 100755
@@ -5038,7 +5038,7 @@ sub process {
 		if ($realfile !~ m@/vmlinux.lds.h$@ &&
 		    $line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
 			my $ln = $linenr;
-			my $cnt = $realcnt;
+			my $cnt = $realcnt - 1;
 			my ($off, $dstat, $dcond, $rest);
 			my $ctx = '';
 			my $has_flow_statement = 0;

@@ -5075,6 +5075,11 @@ sub process {
 			{
 			}
 
+			# Extremely long macros may fall off the end of the
+			# available context without closing.  Give a dangling
+			# backslash the benefit of the doubt and allow it
+			# to gobble any hanging close-parens.
+			$dstat =~ s/\(.+\\$/1/;
 			# Flatten any obvious string concatentation.
 			while ($dstat =~ s/($String)\s*$Ident/$1/ ||
 			       $dstat =~ s/$Ident\s*($String)/$1/)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
maintainer
#1 lore raw
Quoted 5 lines · Prakruthi Deepak Heragu

Currently, the checkpatch throws an error on long macro expressions which is more than one line i.e the opening and the closing bracket pair not being on the same line. This patch gives the dangling backslash the benefit of doubt and allows it to consider the closing paranthesis on the next line as part of the macro expression and doesn't throw an error.

Example please.