Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 217583
b: refs/heads/master
c: d2c0a23
h: refs/heads/master
i:
  217581: 3b4fe6e
  217579: c1878cb
  217575: 62a28dd
  217567: 14de0c0
v: v3
  • Loading branch information
Andy Whitcroft authored and Linus Torvalds committed Oct 26, 2010
1 parent d27da8e commit 19b898a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e91b6e263ed6735c766cb14bbe63b9c7bd774526
refs/heads/master: d2c0a23514d8ac4ed10a8e742467cfb72ca3bed8
13 changes: 13 additions & 0 deletions trunk/scripts/checkpatch.pl
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ sub help {
die "$@" if ($@);
}

my $rpt_cleaners = 0;

if ($terse) {
$emacs = 1;
$quiet++;
Expand Down Expand Up @@ -1389,6 +1391,7 @@ sub process {
} elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) {
my $herevet = "$here\n" . cat_vet($rawline) . "\n";
ERROR("trailing whitespace\n" . $herevet);
$rpt_cleaners = 1;
}

# check for Kconfig help text having a real description
Expand Down Expand Up @@ -1450,6 +1453,7 @@ sub process {
$rawline =~ /^\+\s* \s*/) {
my $herevet = "$here\n" . cat_vet($rawline) . "\n";
ERROR("code indent should use tabs where possible\n" . $herevet);
$rpt_cleaners = 1;
}

# check for space before tabs.
Expand Down Expand Up @@ -2842,6 +2846,15 @@ sub process {
print "\n" if ($quiet == 0);
}

if ($quiet == 0) {
# If there were whitespace errors which cleanpatch can fix
# then suggest that.
if ($rpt_cleaners) {
print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n";
print " scripts/cleanfile\n\n";
}
}

if ($clean == 1 && $quiet == 0) {
print "$vname has no obvious style problems and is ready for submission.\n"
}
Expand Down

0 comments on commit 19b898a

Please sign in to comment.