* [PATCH 0/2] checkpatch: Add ability to insert/delete lines
@ 2014-07-08 17:53 Joe Perches
2014-07-08 17:53 ` [PATCH 1/2] checkpatch: Add an index variable for fixed lines Joe Perches
2014-07-08 17:53 ` [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file Joe Perches
0 siblings, 2 replies; 7+ messages in thread
From: Joe Perches @ 2014-07-08 17:53 UTC (permalink / raw)
To: Andrew Morton
Cc: Andy Whitcroft, Dan Carpenter, Josh Triplett, Greg Kroah-Hartman,
linux-kernel
Creating patches for files or modifying existing patches can be a bit
easier when lines need to be added or deleted.
Here's a start at that.
There are still false positives for things like
For example, this can be useful for staging where blank lines after
declarations are desired.
For instance: (using --strict also enables multiple blank line removals)
for a single file:
$ ./scripts/checkpatch.pl -f --fix-inplace --strict --types=line_spacing \
drivers/staging/android/binder.c
$ git diff --shortstat drivers/staging/android/binder.c
1 file changed, 4 insertions(+), 4 deletions(-)
for all files in drivers/staging:
$ git ls-files "drivers/staging/*.[ch]" | \
xargs ./scripts/checkpatch.pl -f --fix-inplace --strict --types=line_spacing
$ git diff --shortstat drivers/staging/
1028 files changed, 2513 insertions(+), 3540 deletions(-)
There are still some false positives like:
drivers/staging/ced1401/use14_ioc.h where an old Microsoftism for FAR is used.
The test adds an unnecessary blank line there.
So, as ever, this is just a convenience function.
Don't rely on it.
Joe Perches (2):
checkpatch: Add an index variable for fixed lines
checkpatch: Add ability to insert and delete lines to patch/file
scripts/checkpatch.pl | 255 +++++++++++++++++++++++++++++++++++++-------------
1 file changed, 190 insertions(+), 65 deletions(-)
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] checkpatch: Add an index variable for fixed lines
2014-07-08 17:53 [PATCH 0/2] checkpatch: Add ability to insert/delete lines Joe Perches
@ 2014-07-08 17:53 ` Joe Perches
2014-07-08 17:53 ` [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file Joe Perches
1 sibling, 0 replies; 7+ messages in thread
From: Joe Perches @ 2014-07-08 17:53 UTC (permalink / raw)
To: Andrew Morton
Cc: Andy Whitcroft, Dan Carpenter, Josh Triplett, Greg Kroah-Hartman,
linux-kernel
Make the fix code a bit easier to read.
This should also start to allow an easier mechanism to insert/delete
lines eventually too.
Signed-off-by: Joe Perches <joe@perches.com>
---
scripts/checkpatch.pl | 114 ++++++++++++++++++++++++++------------------------
1 file changed, 60 insertions(+), 54 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 496f9ab..ecb8290 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -583,6 +583,8 @@ $chk_signoff = 0 if ($file);
my @rawlines = ();
my @lines = ();
my @fixed = ();
+my $fixlinenr = -1;
+
my $vname;
for my $filename (@ARGV) {
my $FILE;
@@ -611,6 +613,7 @@ for my $filename (@ARGV) {
@rawlines = ();
@lines = ();
@fixed = ();
+ $fixlinenr = -1;
}
exit($exit);
@@ -1801,8 +1804,10 @@ sub process {
$realcnt = 0;
$linenr = 0;
+ $fixlinenr = -1;
foreach my $line (@lines) {
$linenr++;
+ $fixlinenr++;
my $sline = $line; #copy of $line
$sline =~ s/$;/ /g; #with comments as spaces
@@ -1933,7 +1938,7 @@ sub process {
if (WARN("BAD_SIGN_OFF",
"Do not use whitespace before $ucfirst_sign_off\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =
+ $fixed[$fixlinenr] =
"$ucfirst_sign_off $email";
}
}
@@ -1941,7 +1946,7 @@ sub process {
if (WARN("BAD_SIGN_OFF",
"'$ucfirst_sign_off' is the preferred signature form\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =
+ $fixed[$fixlinenr] =
"$ucfirst_sign_off $email";
}
@@ -1950,7 +1955,7 @@ sub process {
if (WARN("BAD_SIGN_OFF",
"Use a single space after $ucfirst_sign_off\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =
+ $fixed[$fixlinenr] =
"$ucfirst_sign_off $email";
}
}
@@ -2078,14 +2083,14 @@ sub process {
if (ERROR("DOS_LINE_ENDINGS",
"DOS line endings\n" . $herevet) &&
$fix) {
- $fixed[$linenr - 1] =~ s/[\s\015]+$//;
+ $fixed[$fixlinenr] =~ s/[\s\015]+$//;
}
} elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) {
my $herevet = "$here\n" . cat_vet($rawline) . "\n";
if (ERROR("TRAILING_WHITESPACE",
"trailing whitespace\n" . $herevet) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\s+$//;
+ $fixed[$fixlinenr] =~ s/\s+$//;
}
$rpt_cleaners = 1;
@@ -2224,7 +2229,7 @@ sub process {
if (WARN("QUOTED_WHITESPACE_BEFORE_NEWLINE",
"unnecessary whitespace before a quoted newline\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/^(\+.*\".*)\s+\\n/$1\\n/;
+ $fixed[$fixlinenr] =~ s/^(\+.*\".*)\s+\\n/$1\\n/;
}
}
@@ -2261,7 +2266,7 @@ sub process {
if (ERROR("CODE_INDENT",
"code indent should use tabs where possible\n" . $herevet) &&
$fix) {
- $fixed[$linenr - 1] =~ s/^\+([ \t]+)/"\+" . tabify($1)/e;
+ $fixed[$fixlinenr] =~ s/^\+([ \t]+)/"\+" . tabify($1)/e;
}
}
@@ -2271,9 +2276,9 @@ sub process {
if (WARN("SPACE_BEFORE_TAB",
"please, no space before tabs\n" . $herevet) &&
$fix) {
- while ($fixed[$linenr - 1] =~
+ while ($fixed[$fixlinenr] =~
s/(^\+.*) {8,8}+\t/$1\t\t/) {}
- while ($fixed[$linenr - 1] =~
+ while ($fixed[$fixlinenr] =~
s/(^\+.*) +\t/$1\t/) {}
}
}
@@ -2307,7 +2312,7 @@ sub process {
if (CHK("PARENTHESIS_ALIGNMENT",
"Alignment should match open parenthesis\n" . $hereprev) &&
$fix && $line =~ /^\+/) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/^\+[ \t]*/\+$goodtabindent/;
}
}
@@ -2318,7 +2323,7 @@ sub process {
if (CHK("SPACING",
"No space is necessary after a cast\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/(\(\s*$Type\s*\))[ \t]+/$1/;
}
}
@@ -2422,7 +2427,7 @@ sub process {
if (WARN("LEADING_SPACE",
"please, no spaces at the start of a line\n" . $herevet) &&
$fix) {
- $fixed[$linenr - 1] =~ s/^\+([ \t]+)/"\+" . tabify($1)/e;
+ $fixed[$fixlinenr] =~ s/^\+([ \t]+)/"\+" . tabify($1)/e;
}
}
@@ -2777,10 +2782,10 @@ sub process {
if (ERROR("C99_COMMENTS",
"do not use C99 // comments\n" . $herecurr) &&
$fix) {
- my $line = $fixed[$linenr - 1];
+ my $line = $fixed[$fixlinenr];
if ($line =~ /\/\/(.*)$/) {
my $comment = trim($1);
- $fixed[$linenr - 1] =~ s@\/\/(.*)$@/\* $comment \*/@;
+ $fixed[$fixlinenr] =~ s@\/\/(.*)$@/\* $comment \*/@;
}
}
}
@@ -2839,7 +2844,7 @@ sub process {
"do not initialise globals to 0 or NULL\n" .
$herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/($Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/$1;/;
+ $fixed[$fixlinenr] =~ s/($Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/$1;/;
}
}
# check for static initialisers.
@@ -2848,7 +2853,7 @@ sub process {
"do not initialise statics to 0 or NULL\n" .
$herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/(\bstatic\s.*?)\s*=\s*(0|NULL|false)\s*;/$1;/;
+ $fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*(0|NULL|false)\s*;/$1;/;
}
}
@@ -2878,7 +2883,7 @@ sub process {
if (ERROR("FUNCTION_WITHOUT_ARGS",
"Bad function definition - $1() should probably be $1(void)\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/(\b($Type)\s+($Ident))\s*\(\s*\)/$2 $3(void)/;
+ $fixed[$fixlinenr] =~ s/(\b($Type)\s+($Ident))\s*\(\s*\)/$2 $3(void)/;
}
}
@@ -2887,7 +2892,7 @@ sub process {
if (WARN("DEFINE_PCI_DEVICE_TABLE",
"Prefer struct pci_device_id over deprecated DEFINE_PCI_DEVICE_TABLE\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /;
+ $fixed[$fixlinenr] =~ s/\b(?:static\s+|)DEFINE_PCI_DEVICE_TABLE\s*\(\s*(\w+)\s*\)\s*=\s*/static const struct pci_device_id $1\[\] = /;
}
}
@@ -2924,7 +2929,7 @@ sub process {
my $sub_from = $ident;
my $sub_to = $ident;
$sub_to =~ s/\Q$from\E/$to/;
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s@\Q$sub_from\E@$sub_to@;
}
}
@@ -2952,7 +2957,7 @@ sub process {
my $sub_from = $match;
my $sub_to = $match;
$sub_to =~ s/\Q$from\E/$to/;
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s@\Q$sub_from\E@$sub_to@;
}
}
@@ -3014,7 +3019,7 @@ sub process {
if (WARN("PREFER_PR_LEVEL",
"Prefer pr_warn(... to pr_warning(...\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/\bpr_warning\b/pr_warn/;
}
}
@@ -3048,7 +3053,7 @@ sub process {
if (WARN("SPACING",
"missing space after $1 definition\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/^(.\s*(?:typedef\s+)?(?:enum|union|struct)(?:\s+$Ident){1,2})([=\{])/$1 $2/;
}
}
@@ -3118,7 +3123,7 @@ sub process {
}
if (show_type("SPACING") && $fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/^(.\s*)$Declare\s*\(\s*\*\s*$Ident\s*\)\s*\(/$1 . $declare . $post_declare_space . '(*' . $funcname . ')('/ex;
}
}
@@ -3135,7 +3140,7 @@ sub process {
if (ERROR("BRACKET_SPACE",
"space prohibited before open square bracket '['\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/^(\+.*?)\s+\[/$1\[/;
}
}
@@ -3170,7 +3175,7 @@ sub process {
if (WARN("SPACING",
"space prohibited between function name and open parenthesis '('\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/\b$name\s+\(/$name\(/;
}
}
@@ -3438,8 +3443,8 @@ sub process {
$fixed_line = $fixed_line . $fix_elements[$#elements];
}
- if ($fix && $line_fixed && $fixed_line ne $fixed[$linenr - 1]) {
- $fixed[$linenr - 1] = $fixed_line;
+ if ($fix && $line_fixed && $fixed_line ne $fixed[$fixlinenr]) {
+ $fixed[$fixlinenr] = $fixed_line;
}
@@ -3450,7 +3455,7 @@ sub process {
if (WARN("SPACING",
"space prohibited before semicolon\n" . $herecurr) &&
$fix) {
- 1 while $fixed[$linenr - 1] =~
+ 1 while $fixed[$fixlinenr] =~
s/^(\+.*\S)\s+;/$1;/;
}
}
@@ -3483,7 +3488,7 @@ sub process {
if (ERROR("SPACING",
"space required before the open brace '{'\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/^(\+.*(?:do|\))){/$1 {/;
+ $fixed[$fixlinenr] =~ s/^(\+.*(?:do|\))){/$1 {/;
}
}
@@ -3501,7 +3506,7 @@ sub process {
if (ERROR("SPACING",
"space required after that close brace '}'\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/}((?!(?:,|;|\)))\S)/} $1/;
}
}
@@ -3511,7 +3516,7 @@ sub process {
if (ERROR("SPACING",
"space prohibited after that open square bracket '['\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/\[\s+/\[/;
}
}
@@ -3519,7 +3524,7 @@ sub process {
if (ERROR("SPACING",
"space prohibited before that close square bracket ']'\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/\s+\]/\]/;
}
}
@@ -3530,7 +3535,7 @@ sub process {
if (ERROR("SPACING",
"space prohibited after that open parenthesis '('\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/\(\s+/\(/;
}
}
@@ -3540,7 +3545,8 @@ sub process {
if (ERROR("SPACING",
"space prohibited before that close parenthesis ')'\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ print("fixlinenr: <$fixlinenr> fixed[fixlinenr]: <$fixed[$fixlinenr]>\n");
+ $fixed[$fixlinenr] =~
s/\s+\)/\)/;
}
}
@@ -3559,7 +3565,7 @@ sub process {
if (WARN("INDENTED_LABEL",
"labels should not be indented\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/^(.)\s+/$1/;
}
}
@@ -3621,7 +3627,7 @@ sub process {
if (ERROR("SPACING",
"space required before the open parenthesis '('\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/\b(if|while|for|switch)\(/$1 \(/;
}
}
@@ -3758,7 +3764,7 @@ sub process {
"Avoid gcc v4.3+ binary constant extension: <$var>\n" . $herecurr) &&
$fix) {
my $hexval = sprintf("0x%x", oct($var));
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/\b$var\b/$hexval/;
}
}
@@ -3794,7 +3800,7 @@ sub process {
if (WARN("WHITESPACE_AFTER_LINE_CONTINUATION",
"Whitespace after \\ makes next lines useless\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\s+$//;
+ $fixed[$fixlinenr] =~ s/\s+$//;
}
}
@@ -4149,7 +4155,7 @@ sub process {
WARN("MISPLACED_INIT",
"$attr should be placed after $var\n" . $herecurr))) &&
$fix) {
- $fixed[$linenr - 1] =~ s/(\bstatic\s+(?:const\s+)?)(?:$attr\s+)?($NonptrTypeWithAttr)\s+(?:$attr\s+)?($Ident(?:\[[^]]*\])?)\s*([=;])\s*/"$1" . trim(string_find_replace($2, "\\s*$attr\\s*", " ")) . " " . trim(string_find_replace($3, "\\s*$attr\\s*", "")) . " $attr" . ("$4" eq ";" ? ";" : " = ")/e;
+ $fixed[$fixlinenr] =~ s/(\bstatic\s+(?:const\s+)?)(?:$attr\s+)?($NonptrTypeWithAttr)\s+(?:$attr\s+)?($Ident(?:\[[^]]*\])?)\s*([=;])\s*/"$1" . trim(string_find_replace($2, "\\s*$attr\\s*", " ")) . " " . trim(string_find_replace($3, "\\s*$attr\\s*", "")) . " $attr" . ("$4" eq ";" ? ";" : " = ")/e;
}
}
}
@@ -4163,7 +4169,7 @@ sub process {
if (ERROR("INIT_ATTRIBUTE",
"Use of const init definition must use ${attr_prefix}initconst\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/$InitAttributeData/${attr_prefix}initconst/;
}
}
@@ -4174,12 +4180,12 @@ sub process {
if (ERROR("INIT_ATTRIBUTE",
"Use of $attr requires a separate use of const\n" . $herecurr) &&
$fix) {
- my $lead = $fixed[$linenr - 1] =~
+ my $lead = $fixed[$fixlinenr] =~
/(^\+\s*(?:static\s+))/;
$lead = rtrim($1);
$lead = "$lead " if ($lead !~ /^\+$/);
$lead = "${lead}const ";
- $fixed[$linenr - 1] =~ s/(^\+\s*(?:static\s+))/$lead/;
+ $fixed[$fixlinenr] =~ s/(^\+\s*(?:static\s+))/$lead/;
}
}
@@ -4192,7 +4198,7 @@ sub process {
if (WARN("CONSTANT_CONVERSION",
"$constant_func should be $func\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\b$constant_func\b/$func/g;
+ $fixed[$fixlinenr] =~ s/\b$constant_func\b/$func/g;
}
}
@@ -4242,7 +4248,7 @@ sub process {
if (ERROR("SPACING",
"exactly one space required after that #$1\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~
+ $fixed[$fixlinenr] =~
s/^(.\s*\#\s*(ifdef|ifndef|elif))\s{2,}/$1 /;
}
@@ -4290,7 +4296,7 @@ sub process {
if (WARN("INLINE",
"plain inline is preferred over $1\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\b(__inline__|__inline)\b/inline/;
+ $fixed[$fixlinenr] =~ s/\b(__inline__|__inline)\b/inline/;
}
}
@@ -4315,7 +4321,7 @@ sub process {
if (WARN("PREFER_PRINTF",
"__printf(string-index, first-to-check) is preferred over __attribute__((format(printf, string-index, first-to-check)))\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.*)\)\s*\)\s*\)/"__printf(" . trim($1) . ")"/ex;
+ $fixed[$fixlinenr] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.*)\)\s*\)\s*\)/"__printf(" . trim($1) . ")"/ex;
}
}
@@ -4326,7 +4332,7 @@ sub process {
if (WARN("PREFER_SCANF",
"__scanf(string-index, first-to-check) is preferred over __attribute__((format(scanf, string-index, first-to-check)))\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\s*,\s*(.*)\)\s*\)\s*\)/"__scanf(" . trim($1) . ")"/ex;
+ $fixed[$fixlinenr] =~ s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*scanf\s*,\s*(.*)\)\s*\)\s*\)/"__scanf(" . trim($1) . ")"/ex;
}
}
@@ -4341,7 +4347,7 @@ sub process {
if (WARN("SIZEOF_PARENTHESIS",
"sizeof $1 should be sizeof($1)\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/"sizeof(" . trim($1) . ")"/ex;
+ $fixed[$fixlinenr] =~ s/\bsizeof\s+((?:\*\s*|)$Lval|$Type(?:\s+$Lval|))/"sizeof(" . trim($1) . ")"/ex;
}
}
@@ -4364,7 +4370,7 @@ sub process {
if (WARN("PREFER_SEQ_PUTS",
"Prefer seq_puts to seq_printf\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\bseq_printf\b/seq_puts/;
+ $fixed[$fixlinenr] =~ s/\bseq_printf\b/seq_puts/;
}
}
}
@@ -4393,7 +4399,7 @@ sub process {
if (WARN("PREFER_ETHER_ADDR_COPY",
"Prefer ether_addr_copy() over memcpy() if the Ethernet addresses are __aligned(2)\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/ether_addr_copy($2, $7)/;
+ $fixed[$fixlinenr] =~ s/\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/ether_addr_copy($2, $7)/;
}
}
@@ -4481,7 +4487,7 @@ sub process {
if (CHK("AVOID_EXTERNS",
"extern prototypes should be avoided in .h files\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/(.*)\bextern\b\s*(.*)/$1$2/;
+ $fixed[$fixlinenr] =~ s/(.*)\bextern\b\s*(.*)/$1$2/;
}
}
@@ -4558,7 +4564,7 @@ sub process {
if (WARN("ALLOC_WITH_MULTIPLY",
"Prefer $newfunc over $oldfunc with multiply\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
+ $fixed[$fixlinenr] =~ s/\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)/$1 . ' = ' . "$newfunc(" . trim($r1) . ', ' . trim($r2)/e;
}
}
@@ -4582,7 +4588,7 @@ sub process {
if (WARN("ONE_SEMICOLON",
"Statements terminations use 1 semicolon\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/(\s*;\s*){2,}$/;/g;
+ $fixed[$fixlinenr] =~ s/(\s*;\s*){2,}$/;/g;
}
}
@@ -4630,7 +4636,7 @@ sub process {
if (WARN("USE_FUNC",
"__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr) &&
$fix) {
- $fixed[$linenr - 1] =~ s/\b__FUNCTION__\b/__func__/g;
+ $fixed[$fixlinenr] =~ s/\b__FUNCTION__\b/__func__/g;
}
}
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file
2014-07-08 17:53 [PATCH 0/2] checkpatch: Add ability to insert/delete lines Joe Perches
2014-07-08 17:53 ` [PATCH 1/2] checkpatch: Add an index variable for fixed lines Joe Perches
@ 2014-07-08 17:53 ` Joe Perches
2014-07-08 20:24 ` Andrew Morton
1 sibling, 1 reply; 7+ messages in thread
From: Joe Perches @ 2014-07-08 17:53 UTC (permalink / raw)
To: Andrew Morton
Cc: Andy Whitcroft, Dan Carpenter, Josh Triplett, Greg Kroah-Hartman,
linux-kernel
This can be valuable to insert or delete blank lines as well
as fix misplaced brace or else uses.
Store indexes of lines to be added/deleted and the new lines.
When creating the --fix file, insert or delete the appropriate
lines and update the patch range information.
Signed-off-by: Joe Perches <joe@perches.com>
---
scripts/checkpatch.pl | 141 ++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 130 insertions(+), 11 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index ecb8290..d5d7764 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -583,6 +583,8 @@ $chk_signoff = 0 if ($file);
my @rawlines = ();
my @lines = ();
my @fixed = ();
+my @fixed_inserted = ();
+my @fixed_deleted = ();
my $fixlinenr = -1;
my $vname;
@@ -613,6 +615,8 @@ for my $filename (@ARGV) {
@rawlines = ();
@lines = ();
@fixed = ();
+ @fixed_inserted = ();
+ @fixed_deleted = ();
$fixlinenr = -1;
}
@@ -1526,6 +1530,69 @@ sub report_dump {
our @report;
}
+sub fixup_current_range {
+ my ($lineRef, $offset, $length) = @_;
+
+ if ($$lineRef =~ /^\@\@ -\d+,\d+ \+(\d+),(\d+) \@\@/) {
+ my $o = $1;
+ my $l = $2;
+ my $no = $o + $offset;
+ my $nl = $l + $length;
+ $$lineRef =~ s/\+$o,$l \@\@/\+$no,$nl \@\@/;
+ }
+}
+
+sub fix_inserted_deleted_lines {
+ my ($linesRef, $insertedRef, $deletedRef) = @_;
+
+ my $range_last_linenr = 0;
+ my $delta_offset = 0;
+
+ my $old_linenr = 0;
+ my $new_linenr = 0;
+
+ my $next_insert = 0;
+ my $next_delete = 0;
+
+ my @lines = ();
+
+ my $inserted = @{$insertedRef}[$next_insert++];
+ my $deleted = @{$deletedRef}[$next_delete++];
+
+ foreach my $old_line (@{$linesRef}) {
+ my $save_line = 1;
+ my $line = $old_line; #don't modify the array
+ if ($line =~ /^(?:\+\+\+\|\-\-\-)\s+\S+/) { #new filename
+ $delta_offset = 0;
+ } elsif ($line =~ /^\@\@ -\d+,\d+ \+\d+,\d+ \@\@/) { #new hunk
+ $range_last_linenr = $new_linenr;
+ fixup_current_range(\$line, $delta_offset, 0);
+ }
+
+ while (defined($deleted) && ${$deleted}{'LINENR'} == $old_linenr) {
+ $deleted = @{$deletedRef}[$next_delete++];
+ $save_line = 0;
+ fixup_current_range(\$lines[$range_last_linenr], $delta_offset--, -1);
+ }
+
+ while (defined($inserted) && ${$inserted}{'LINENR'} == $old_linenr) {
+ push(@lines, ${$inserted}{'LINE'});
+ $inserted = @{$insertedRef}[$next_insert++];
+ $new_linenr++;
+ fixup_current_range(\$lines[$range_last_linenr], $delta_offset++, 1);
+ }
+
+ if ($save_line) {
+ push(@lines, $line);
+ $new_linenr++;
+ }
+
+ $old_linenr++;
+ }
+
+ return @lines;
+}
+
sub ERROR {
my ($type, $msg) = @_;
@@ -2366,16 +2433,31 @@ sub process {
$line =~ /^\+\s*(?:static\s+)?[A-Z_]*ATTR/ ||
$line =~ /^\+\s*DECLARE/ ||
$line =~ /^\+\s*__setup/)) {
- CHK("LINE_SPACING",
- "Please use a blank line after function/struct/union/enum declarations\n" . $hereprev);
+ if (CHK("LINE_SPACING",
+ "Please use a blank line after function/struct/union/enum declarations\n" . $hereprev) &&
+ $fix) {
+ my $inserted = {
+ LINENR => $fixlinenr,
+ LINE => "\+",
+ };
+ push(@fixed_inserted, $inserted);
+ }
}
# check for multiple consecutive blank lines
if ($prevline =~ /^[\+ ]\s*$/ &&
$line =~ /^\+\s*$/ &&
$last_blank_line != ($linenr - 1)) {
- CHK("LINE_SPACING",
- "Please don't use multiple blank lines\n" . $hereprev);
+ if (CHK("LINE_SPACING",
+ "Please don't use multiple blank lines\n" . $hereprev) &&
+ $fix) {
+ my $deleted = {
+ LINENR => $fixlinenr,
+ LINE => $rawline,
+ };
+ push(@fixed_deleted, $deleted);
+ }
+
$last_blank_line = $linenr;
}
@@ -2413,8 +2495,15 @@ sub process {
$sline =~ /^\+\s+\(?\s*(?:$Compare|$Assignment|$Operators)/) &&
# indentation of previous and current line are the same
(($prevline =~ /\+(\s+)\S/) && $sline =~ /^\+$1\S/)) {
- WARN("LINE_SPACING",
- "Missing a blank line after declarations\n" . $hereprev);
+ if (WARN("LINE_SPACING",
+ "Missing a blank line after declarations\n" . $hereprev) &&
+ $fix) {
+ my $inserted = {
+ LINENR => $fixlinenr,
+ LINE => "\+",
+ };
+ push(@fixed_inserted, $inserted);
+ }
}
# check for spaces at the beginning of a line.
@@ -2606,7 +2695,7 @@ sub process {
#print "realcnt<$realcnt> ctx_cnt<$ctx_cnt>\n";
#print "pre<$pre_ctx>\nline<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>\n";
- if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln -1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) {
+ if ($ctx !~ /{\s*/ && defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^\+\s*{/) {
ERROR("OPEN_BRACE",
"that open brace { should be on the previous line\n" .
"$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
@@ -2756,8 +2845,34 @@ sub process {
# check for initialisation to aggregates open brace on the next line
if ($line =~ /^.\s*{/ &&
$prevline =~ /(?:^|[^=])=\s*$/) {
- ERROR("OPEN_BRACE",
- "that open brace { should be on the previous line\n" . $hereprev);
+ if (ERROR("OPEN_BRACE",
+ "that open brace { should be on the previous line\n" . $hereprev) &&
+ $fix && $prevline =~ /^\+/) {
+ my $deleted = {
+ LINENR => $fixlinenr - 1,
+ LINE => $prevrawline,
+ };
+ push(@fixed_deleted, $deleted);
+ $deleted = {
+ LINENR => $fixlinenr,
+ LINE => $rawline,
+ };
+ push(@fixed_deleted, $deleted);
+ my $fixedline = $prevrawline;
+ $fixedline =~ s/\s*=\s*$/ = {/;
+ my $inserted = {
+ LINENR => $fixlinenr,
+ LINE => $fixedline,
+ };
+ push(@fixed_inserted, $inserted);
+ $fixedline = $line;
+ $fixedline =~ s/^(.\s*){\s*/$1/;
+ $inserted = {
+ LINENR => $fixlinenr,
+ LINE => $fixedline,
+ };
+ push(@fixed_inserted, $inserted);
+ }
}
#
@@ -4879,12 +4994,16 @@ sub process {
hash_show_words(\%use_type, "Used");
hash_show_words(\%ignore_type, "Ignored");
- if ($clean == 0 && $fix && "@rawlines" ne "@fixed") {
+ if ($clean == 0 && $fix &&
+ ("@rawlines" ne "@fixed" ||
+ $#fixed_inserted >= 0 || $#fixed_deleted >= 0)) {
my $newfile = $filename;
$newfile .= ".EXPERIMENTAL-checkpatch-fixes" if (!$fix_inplace);
my $linecount = 0;
my $f;
+ @fixed = fix_inserted_deleted_lines(\@fixed, \@fixed_inserted, \@fixed_deleted);
+
open($f, '>', $newfile)
or die "$P: Can't open $newfile for write\n";
foreach my $fixed_line (@fixed) {
@@ -4892,7 +5011,7 @@ sub process {
if ($file) {
if ($linecount > 3) {
$fixed_line =~ s/^\+//;
- print $f $fixed_line. "\n";
+ print $f $fixed_line . "\n";
}
} else {
print $f $fixed_line . "\n";
--
1.8.1.2.459.gbcd45b4.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file
2014-07-08 17:53 ` [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file Joe Perches
@ 2014-07-08 20:24 ` Andrew Morton
2014-07-08 20:57 ` Joe Perches
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Morton @ 2014-07-08 20:24 UTC (permalink / raw)
To: Joe Perches
Cc: Andy Whitcroft, Dan Carpenter, Josh Triplett, Greg Kroah-Hartman,
linux-kernel
On Tue, 8 Jul 2014 10:53:36 -0700 Joe Perches <joe@perches.com> wrote:
> This can be valuable to insert or delete blank lines as well
> as fix misplaced brace or else uses.
hm, do we really want to go down this path? It's a very long one and
it leads to /usr/bin/indent?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file
2014-07-08 20:24 ` Andrew Morton
@ 2014-07-08 20:57 ` Joe Perches
2014-07-08 21:07 ` Andrew Morton
0 siblings, 1 reply; 7+ messages in thread
From: Joe Perches @ 2014-07-08 20:57 UTC (permalink / raw)
To: Andrew Morton
Cc: Andy Whitcroft, Dan Carpenter, Josh Triplett, Greg Kroah-Hartman,
linux-kernel
On Tue, 2014-07-08 at 13:24 -0700, Andrew Morton wrote:
> On Tue, 8 Jul 2014 10:53:36 -0700 Joe Perches <joe@perches.com> wrote:
>
> > This can be valuable to insert or delete blank lines as well
> > as fix misplaced brace or else uses.
>
> hm, do we really want to go down this path?
Maybe, maybe not.
I've seen a lot of patches that people seem to spend
time producing (frequently incorrectly done too) that
could be better automated.
> It's a very long one and it leads to /usr/bin/indent?
For now, I think it's a pretty minimal bit of code.
I think most of the formatting suggestions emitted by
checkpatch are maybe a bit more sensible than indent.
indent makes crappy decisions about line length and
argument wrapping, comment location, and other things.
checkpatch doesn't (and I won't make it) even try.
checkpatch's --fix option hasn't been taken up very
widely. (not yet?, not ever? dunno)
I've suggested Lindent be removed from the tree.
https://lkml.org/lkml/2013/2/11/390
I once suggested a template script that uses individual
--fix options to try to make it easier to clean up files.
https://lkml.org/lkml/2013/9/23/504
Maybe that could be used to supplement or replace Lindent.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file
2014-07-08 20:57 ` Joe Perches
@ 2014-07-08 21:07 ` Andrew Morton
2014-07-08 21:24 ` Joe Perches
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Morton @ 2014-07-08 21:07 UTC (permalink / raw)
To: Joe Perches
Cc: Andy Whitcroft, Dan Carpenter, Josh Triplett, Greg Kroah-Hartman,
linux-kernel
On Tue, 08 Jul 2014 13:57:44 -0700 Joe Perches <joe@perches.com> wrote:
> On Tue, 2014-07-08 at 13:24 -0700, Andrew Morton wrote:
> > On Tue, 8 Jul 2014 10:53:36 -0700 Joe Perches <joe@perches.com> wrote:
> >
> > > This can be valuable to insert or delete blank lines as well
> > > as fix misplaced brace or else uses.
> >
> > hm, do we really want to go down this path?
>
> Maybe, maybe not.
>
> I've seen a lot of patches that people seem to spend
> time producing (frequently incorrectly done too) that
> could be better automated.
>
> > It's a very long one and it leads to /usr/bin/indent?
>
> For now, I think it's a pretty minimal bit of code.
No strong opinions here.
> I've suggested Lindent be removed from the tree.
> https://lkml.org/lkml/2013/2/11/390
Maybe it's fixable, dunno - I don't recall ever seeing anyone get down
and poke at it. Of course, indent itself is open source...
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file
2014-07-08 21:07 ` Andrew Morton
@ 2014-07-08 21:24 ` Joe Perches
0 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2014-07-08 21:24 UTC (permalink / raw)
To: Andrew Morton
Cc: Andy Whitcroft, Dan Carpenter, Josh Triplett, Greg Kroah-Hartman,
linux-kernel
On Tue, 2014-07-08 at 14:07 -0700, Andrew Morton wrote:
> On Tue, 08 Jul 2014 13:57:44 -0700 Joe Perches <joe@perches.com> wrote:
> > I've suggested Lindent be removed from the tree.
> > https://lkml.org/lkml/2013/2/11/390
>
> Maybe it's fixable, dunno - I don't recall ever seeing anyone get down
> and poke at it. Of course, indent itself is open source...
As open source projects go, indent is pretty dead.
indent's been looking hopelessly/helplessly for a
new maintainer for a long time.
I think the last time Lindent as run over any bit
of kernel code was when Linus made a mess of the
reiserfs code.
It was setup reasonably well for 132 columns, but
Lindent made it unreadable with all sorts of
foo.
bar
[baz]
= func(
arg1,
arg2);
lines.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-07-08 21:24 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-08 17:53 [PATCH 0/2] checkpatch: Add ability to insert/delete lines Joe Perches
2014-07-08 17:53 ` [PATCH 1/2] checkpatch: Add an index variable for fixed lines Joe Perches
2014-07-08 17:53 ` [PATCH 2/2] checkpatch: Add ability to insert and delete lines to patch/file Joe Perches
2014-07-08 20:24 ` Andrew Morton
2014-07-08 20:57 ` Joe Perches
2014-07-08 21:07 ` Andrew Morton
2014-07-08 21:24 ` Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox