p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

checkpatch: add sub routine get_stat_real() 

checkpatch currently contains duplicate code.  We can define a sub
routine and call that instead.  This reduces code duplication and line
count.

Add subroutine get_stat_real()

Link: http://lkml.kernel.org/r/1519700648-23108-2-git-send-email-me@tobin.cc
Signed-off-by: Tobin C. Harding <me@tobin.cc>
Cc: 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:
Tobin C. Harding 2018-04-10 16:33:20 -07:00 committed by Linus Torvalds
parent 3d102fc0e7
commit 2a9f9d851c
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
scripts/checkpatch.pl
View File

@ -1645,6 +1645,17 @@ sub raw_line {
return $line; return $line;
} }
sub get_stat_real {
my ($linenr, $lc) = @_;
my $stat_real = raw_line($linenr, 0);
for (my $count = $linenr + 1; $count <= $lc; $count++) {
$stat_real = $stat_real . "\n" . raw_line($count, 0);
}
return $stat_real;
}
sub cat_vet { sub cat_vet {
my ($vet) = @_; my ($vet) = @_;
my ($res, $coded); my ($res, $coded);
@ -5821,17 +5832,15 @@ sub process {
} }
} }
if ($bad_extension ne "") { if ($bad_extension ne "") {
my $stat_real = raw_line($linenr, 0); my $stat_real = get_stat_real($linenr, $lc);
my $ext_type = "Invalid"; my $ext_type = "Invalid";
my $use = ""; my $use = "";
for (my $count = $linenr + 1; $count <= $lc; $count++) {
$stat_real = $stat_real . "\n" . raw_line($count, 0);
}
if ($bad_extension =~ /p[Ff]/) { if ($bad_extension =~ /p[Ff]/) {
$ext_type = "Deprecated"; $ext_type = "Deprecated";
$use = " - use %pS instead"; $use = " - use %pS instead";
$use =~ s/pS/ps/ if ($bad_extension =~ /pf/); $use =~ s/pS/ps/ if ($bad_extension =~ /pf/);
} }
WARN("VSPRINTF_POINTER_EXTENSION", WARN("VSPRINTF_POINTER_EXTENSION",
"$ext_type vsprintf pointer extension '$bad_extension'$use\n" . "$here\n$stat_real\n"); "$ext_type vsprintf pointer extension '$bad_extension'$use\n" . "$here\n$stat_real\n");
} }
@ -5946,10 +5955,7 @@ sub process {
$stat !~ /(?:$Compare)\s*\bsscanf\s*$balanced_parens/)) { $stat !~ /(?:$Compare)\s*\bsscanf\s*$balanced_parens/)) {
my $lc = $stat =~ tr@\n@@; my $lc = $stat =~ tr@\n@@;
$lc = $lc + $linenr; $lc = $lc + $linenr;
my $stat_real = raw_line($linenr, 0); my $stat_real = get_stat_real($linenr, $lc);
for (my $count = $linenr + 1; $count <= $lc; $count++) {
$stat_real = $stat_real . "\n" . raw_line($count, 0);
}
WARN("NAKED_SSCANF", WARN("NAKED_SSCANF",
"unchecked sscanf return value\n" . "$here\n$stat_real\n"); "unchecked sscanf return value\n" . "$here\n$stat_real\n");
} }
@ -5960,10 +5966,7 @@ sub process {
$line =~ /\bsscanf\b/) { $line =~ /\bsscanf\b/) {
my $lc = $stat =~ tr@\n@@; my $lc = $stat =~ tr@\n@@;
$lc = $lc + $linenr; $lc = $lc + $linenr;
my $stat_real = raw_line($linenr, 0); my $stat_real = get_stat_real($linenr, $lc);
for (my $count = $linenr + 1; $count <= $lc; $count++) {
$stat_real = $stat_real . "\n" . raw_line($count, 0);
}
if ($stat_real =~ /\bsscanf\b\s*\(\s*$FuncArg\s*,\s*("[^"]+")/) { if ($stat_real =~ /\bsscanf\b\s*\(\s*$FuncArg\s*,\s*("[^"]+")/) {
my $format = $6; my $format = $6;
my $count = $format =~ tr@%@%@; my $count = $format =~ tr@%@%@;
@ -6397,10 +6400,7 @@ sub process {
my $lc = $stat =~ tr@\n@@; my $lc = $stat =~ tr@\n@@;
$lc = $lc + $linenr; $lc = $lc + $linenr;
my $stat_real = raw_line($linenr, 0); my $stat_real = get_stat_real($linenr, $lc);
for (my $count = $linenr + 1; $count <= $lc; $count++) {
$stat_real = $stat_real . "\n" . raw_line($count, 0);
}
my $skip_args = ""; my $skip_args = "";
if ($arg_pos > 1) { if ($arg_pos > 1) {