[PATCH] checkpatch: Handle long multi-line macros better

[PATCH] checkpatch: Handle long multi-line macros better

[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.

Signed-off-by: Prakruthi Deepak Heragu <pheragu@codeaurora.org>
---
 scripts/checkpatch.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 599ae61..158c96d 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -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/)
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] checkpatch: Handle long multi-line macros better

[Joe Perches]

On Tue, 2018-07-10 at 10:42 -0700, Prakruthi Deepak Heragu wrote:
> 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.