GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-30 11:04:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

checkpatch: improve the embedded function name test for patch contexts

Browse source 
The current test works only for a single patch context as it is done in
the foreach ($rawlines) loop that precedes the loop where the actual
$context_function variable is used.

Move the set of $context_function into the foreach (@lines) loop where
it is useful for each patch context.

Link: http://lkml.kernel.org/r/6c675a31c74fbfad4fc45b9f462303d60ca2a283.1493486091.git.joe@perches.com
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2017-05-08 15:56:02 -07:00 • committed by Linus Torvalds
parent 75ad8c575a
commit 74fd4f347b
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
scripts/checkpatch.pl
View file

@ -2213,8 +2213,7 @@ sub process {
} }
#next; #next;
} }
if ($rawline=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@(.*)/) { if ($rawline =~ /^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
my $context = $4;
$realline=$1-1; $realline=$1-1;
if (defined $2) { if (defined $2) {
$realcnt=$3+1; $realcnt=$3+1;
@ -2223,12 +2222,6 @@ sub process {
} }
$in_comment = 0; $in_comment = 0;
if ($context =~ /\b(\w+)\s*\(/) {
$context_function = $1;
} else {
undef $context_function;
}
# Guestimate if this is a continuing comment. Run # Guestimate if this is a continuing comment. Run
# the context looking for a comment "edge". If this # the context looking for a comment "edge". If this
# edge is a close comment then we must be in a comment # edge is a close comment then we must be in a comment
@ -2299,7 +2292,8 @@ sub process {
#extract the line range in the file after the patch is applied #extract the line range in the file after the patch is applied
if (!$in_commit_log && if (!$in_commit_log &&
$line =~ /^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) { $line =~ /^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@(.*)/) {
my $context = $4;
$is_patch = 1; $is_patch = 1;
$first_line = $linenr + 1; $first_line = $linenr + 1;
$realline=$1-1; $realline=$1-1;
@ -2315,6 +2309,11 @@ sub process {
%suppress_whiletrailers = (); %suppress_whiletrailers = ();
%suppress_export = (); %suppress_export = ();
$suppress_statement = 0; $suppress_statement = 0;
if ($context =~ /\b(\w+)\s*\(/) {
$context_function = $1;
} else {
undef $context_function;
}
next; next;
# track the line number as we move through the hunk, note that # track the line number as we move through the hunk, note that