evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

checkpatch: add fix_insert_line and fix_delete_line helpers

Browse source 
Neaten the uses of patch/file line insertions or deletions.  Hide the
mechanism used.

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 2014-08-06 16:11:07 -07:00 • committed by Linus Torvalds
parent d752fcc88b
commit f2d7e4d439
1 changed files with 29 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
scripts/checkpatch.pl
View file

@ -1593,6 +1593,27 @@ sub fix_inserted_deleted_lines {
return @lines; return @lines;
} }
sub fix_insert_line {
my ($linenr, $line) = @_;
my $inserted = {
LINENR => $linenr,
LINE => $line,
};
push(@fixed_inserted, $inserted);
}
sub fix_delete_line {
my ($linenr, $line) = @_;
my $deleted = {
LINENR => $linenr,
LINE => $line,
};
push(@fixed_deleted, $deleted);
}
sub ERROR { sub ERROR {
my ($type, $msg) = @_; my ($type, $msg) = @_;
@ -2447,11 +2468,7 @@ sub process {
if (CHK("LINE_SPACING", if (CHK("LINE_SPACING",
"Please use a blank line after function/struct/union/enum declarations\n" . $hereprev) && "Please use a blank line after function/struct/union/enum declarations\n" . $hereprev) &&
$fix) { $fix) {
my $inserted = { fix_insert_line($fixlinenr, "\+");
LINENR => $fixlinenr,
LINE => "\+",
};
push(@fixed_inserted, $inserted);
} }
} }
@ -2462,11 +2479,7 @@ sub process {
if (CHK("LINE_SPACING", if (CHK("LINE_SPACING",
"Please don't use multiple blank lines\n" . $hereprev) && "Please don't use multiple blank lines\n" . $hereprev) &&
$fix) { $fix) {
my $deleted = { fix_delete_line($fixlinenr, $rawline);
LINENR => $fixlinenr,
LINE => $rawline,
};
push(@fixed_deleted, $deleted);
} }
$last_blank_line = $linenr; $last_blank_line = $linenr;
@ -2509,11 +2522,7 @@ sub process {
if (WARN("LINE_SPACING", if (WARN("LINE_SPACING",
"Missing a blank line after declarations\n" . $hereprev) && "Missing a blank line after declarations\n" . $hereprev) &&
$fix) { $fix) {
my $inserted = { fix_insert_line($fixlinenr, "\+");
LINENR => $fixlinenr,
LINE => "\+",
};
push(@fixed_inserted, $inserted);
} }
} }
@ -2868,31 +2877,15 @@ sub process {
$prevline =~ /(?:^|[^=])=\s*$/) { $prevline =~ /(?:^|[^=])=\s*$/) {
if (ERROR("OPEN_BRACE", if (ERROR("OPEN_BRACE",
"that open brace { should be on the previous line\n" . $hereprev) && "that open brace { should be on the previous line\n" . $hereprev) &&
$fix && $prevline =~ /^\+/) { $fix && $prevline =~ /^\+/ && $line =~ /^\+/) {
my $deleted = { fix_delete_line($fixlinenr - 1, $prevrawline);
LINENR => $fixlinenr - 1, fix_delete_line($fixlinenr, $rawline);
LINE => $prevrawline,
};
push(@fixed_deleted, $deleted);
$deleted = {
LINENR => $fixlinenr,
LINE => $rawline,
};
push(@fixed_deleted, $deleted);
my $fixedline = $prevrawline; my $fixedline = $prevrawline;
$fixedline =~ s/\s*=\s*$/ = {/; $fixedline =~ s/\s*=\s*$/ = {/;
my $inserted = { fix_insert_line($fixlinenr, $fixedline);
LINENR => $fixlinenr,
LINE => $fixedline,
};
push(@fixed_inserted, $inserted);
$fixedline = $line; $fixedline = $line;
$fixedline =~ s/^(.\s*){\s*/$1/; $fixedline =~ s/^(.\s*){\s*/$1/;
$inserted = { fix_insert_line($fixlinenr, $fixedline);
LINENR => $fixlinenr,
LINE => $fixedline,
};
push(@fixed_inserted, $inserted);
} }
} }