mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-22 22:25:51 +01:00
Apply checkSpace.pl to checkSpace.pl.
svn:r6901
This commit is contained in:
parent
fc9ed724ed
commit
4fe3c607ad
1 changed files with 38 additions and 36 deletions
|
@ -11,23 +11,23 @@ for $fn (@ARGV) {
|
||||||
$lastnil = 0;
|
$lastnil = 0;
|
||||||
$incomment = 0;
|
$incomment = 0;
|
||||||
while (<F>) {
|
while (<F>) {
|
||||||
## Warn about windows-style newlines.
|
## Warn about windows-style newlines.
|
||||||
if (/\r/) {
|
if (/\r/) {
|
||||||
print " CR:$fn:$.\n";
|
print " CR:$fn:$.\n";
|
||||||
}
|
}
|
||||||
## Warn about tabs.
|
## Warn about tabs.
|
||||||
if (/\t/) {
|
if (/\t/) {
|
||||||
print " TAB:$fn:$.\n";
|
print " TAB:$fn:$.\n";
|
||||||
}
|
}
|
||||||
## Warn about trailing whitespace.
|
## Warn about trailing whitespace.
|
||||||
if (/ +$/) {
|
if (/ +$/) {
|
||||||
print "Space\@EOL:$fn:$.\n";
|
print "Space\@EOL:$fn:$.\n";
|
||||||
}
|
}
|
||||||
## Warn about control keywords without following space.
|
## Warn about control keywords without following space.
|
||||||
if ($C && /\s(?:if|while|for|switch)\(/) {
|
if ($C && /\s(?:if|while|for|switch)\(/) {
|
||||||
print " KW(:$fn:$.\n";
|
print " KW(:$fn:$.\n";
|
||||||
}
|
}
|
||||||
## Warn about multiple empty lines.
|
## Warn about multiple empty lines.
|
||||||
if ($lastnil && /^$/) {
|
if ($lastnil && /^$/) {
|
||||||
print " DoubleNL:$fn:$.\n";
|
print " DoubleNL:$fn:$.\n";
|
||||||
} elsif (/^$/) {
|
} elsif (/^$/) {
|
||||||
|
@ -35,15 +35,15 @@ for $fn (@ARGV) {
|
||||||
} else {
|
} else {
|
||||||
$lastnil = 0;
|
$lastnil = 0;
|
||||||
}
|
}
|
||||||
## Terminals are still 80 columns wide in my world. I refuse to
|
## Terminals are still 80 columns wide in my world. I refuse to
|
||||||
## accept double-line lines. Except, of course, svn Id tags
|
## accept double-line lines. Except, of course, svn Id tags
|
||||||
## can make us go long.
|
## can make us go long.
|
||||||
if (/^.{80}/ && !/\$Id: /) {
|
if (/^.{80}/ && !/\$Id: /) {
|
||||||
print " Wide:$fn:$.\n";
|
print " Wide:$fn:$.\n";
|
||||||
}
|
}
|
||||||
### Juju to skip over comments and strings, since the tests
|
### Juju to skip over comments and strings, since the tests
|
||||||
### we're about to do are okay there.
|
### we're about to do are okay there.
|
||||||
if ($C) {
|
if ($C) {
|
||||||
if ($incomment) {
|
if ($incomment) {
|
||||||
if (m!\*/!) {
|
if (m!\*/!) {
|
||||||
s!.*?\*/!!;
|
s!.*?\*/!!;
|
||||||
|
@ -83,29 +83,30 @@ for $fn (@ARGV) {
|
||||||
if (/(\w+)\s\(/) {
|
if (/(\w+)\s\(/) {
|
||||||
if ($1 ne "if" and $1 ne "while" and $1 ne "for" and
|
if ($1 ne "if" and $1 ne "while" and $1 ne "for" and
|
||||||
$1 ne "switch" and $1 ne "return" and $1 ne "int" and
|
$1 ne "switch" and $1 ne "return" and $1 ne "int" and
|
||||||
|
$1 ne "elsif" and
|
||||||
$1 ne "void" and $1 ne "__attribute__") {
|
$1 ne "void" and $1 ne "__attribute__") {
|
||||||
print " fn ():$fn:$.\n";
|
print " fn ():$fn:$.\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
## Warn about functions not declared at start of line.
|
## Warn about functions not declared at start of line.
|
||||||
if ($in_func_head ||
|
if ($in_func_head ||
|
||||||
($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ &&
|
($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ &&
|
||||||
! /^(?:static )?(?:typedef|struct|union)[^\(]*$/ &&
|
! /^(?:static )?(?:typedef|struct|union)[^\(]*$/ &&
|
||||||
! /= *\{$/ && ! /;$/)) {
|
! /= *\{$/ && ! /;$/)) {
|
||||||
if (/.\{$/){
|
if (/.\{$/){
|
||||||
print "fn() {:$fn:$.\n";
|
print "fn() {:$fn:$.\n";
|
||||||
$in_func_head = 0;
|
$in_func_head = 0;
|
||||||
} elsif (/^\S[^\(]* +\**[a-zA-Z0-9_]+\(/) {
|
} elsif (/^\S[^\(]* +\**[a-zA-Z0-9_]+\(/) {
|
||||||
$in_func_head = -1; # started with tp fn
|
$in_func_head = -1; # started with tp fn
|
||||||
} elsif (/;$/) {
|
} elsif (/;$/) {
|
||||||
$in_func_head = 0;
|
$in_func_head = 0;
|
||||||
} elsif (/\{/) {
|
} elsif (/\{/) {
|
||||||
if ($in_func_head == -1) {
|
if ($in_func_head == -1) {
|
||||||
print "tp fn():$fn:$.\n";
|
print "tp fn():$fn:$.\n";
|
||||||
}
|
}
|
||||||
$in_func_head = 0;
|
$in_func_head = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (! $lastnil) {
|
if (! $lastnil) {
|
||||||
|
@ -113,3 +114,4 @@ for $fn (@ARGV) {
|
||||||
}
|
}
|
||||||
close(F);
|
close(F);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue