|
@@ -13,29 +13,29 @@ for $fn (@ARGV) {
|
|
|
$incomment = 0;
|
|
|
while (<F>) {
|
|
|
## Warn about windows-style newlines.
|
|
|
- # (We insist on lines that end with a single LF character, not
|
|
|
- # CR LF.)
|
|
|
+ # (We insist on lines that end with a single LF character, not
|
|
|
+ # CR LF.)
|
|
|
if (/\r/) {
|
|
|
print " CR:$fn:$.\n";
|
|
|
}
|
|
|
## Warn about tabs.
|
|
|
- # (We only use spaces)
|
|
|
+ # (We only use spaces)
|
|
|
if (/\t/) {
|
|
|
print " TAB:$fn:$.\n";
|
|
|
}
|
|
|
## Warn about labels that don't have a space in front of them
|
|
|
- # (We indent every label at least one space)
|
|
|
+ # (We indent every label at least one space)
|
|
|
if (/^[a-zA-Z_][a-zA-Z_0-9]*:/) {
|
|
|
print "nosplabel:$fn:$.\n";
|
|
|
}
|
|
|
## Warn about trailing whitespace.
|
|
|
- # (We don't allow whitespace at the end of the line; make your
|
|
|
- # editor highlight it for you so you can stop adding it in.)
|
|
|
+ # (We don't allow whitespace at the end of the line; make your
|
|
|
+ # editor highlight it for you so you can stop adding it in.)
|
|
|
if (/ +$/) {
|
|
|
print "Space\@EOL:$fn:$.\n";
|
|
|
}
|
|
|
## Warn about control keywords without following space.
|
|
|
- # (We put a space after every 'if', 'while', 'for', 'switch', etc)
|
|
|
+ # (We put a space after every 'if', 'while', 'for', 'switch', etc)
|
|
|
if ($C && /\s(?:if|while|for|switch)\(/) {
|
|
|
print " KW(:$fn:$.\n";
|
|
|
}
|
|
@@ -53,12 +53,12 @@ for $fn (@ARGV) {
|
|
|
# other stuff;
|
|
|
# }
|
|
|
if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and
|
|
|
- $lastline !~ /\{$/) {
|
|
|
+ $lastline !~ /\{$/) {
|
|
|
print "non-K&R {:$fn:$.\n";
|
|
|
- }
|
|
|
+ }
|
|
|
if (/^\s*else/ and $lastline =~ /\}$/) {
|
|
|
- print " }\\nelse:$fn:$.\n";
|
|
|
- }
|
|
|
+ print " }\\nelse:$fn:$.\n";
|
|
|
+ }
|
|
|
$lastline = $_;
|
|
|
## Warn about unnecessary empty lines.
|
|
|
# (Don't put an empty line before a line that contains nothing
|
|
@@ -102,13 +102,13 @@ for $fn (@ARGV) {
|
|
|
s!"(?:[^\"]+|\\.)*"!"X"!g;
|
|
|
next if /^\#/;
|
|
|
## Warn about C++-style comments.
|
|
|
- # (Use C style comments only.)
|
|
|
+ # (Use C style comments only.)
|
|
|
if (m!//!) {
|
|
|
# print " //:$fn:$.\n";
|
|
|
s!//.*!!;
|
|
|
}
|
|
|
## Warn about unquoted braces preceded by non-space.
|
|
|
- # (No character except a space should come before a {)
|
|
|
+ # (No character except a space should come before a {)
|
|
|
if (/([^\s'])\{/) {
|
|
|
print " $1\{:$fn:$.\n";
|
|
|
}
|
|
@@ -122,8 +122,8 @@ for $fn (@ARGV) {
|
|
|
# print " {X:$fn:$.\n";
|
|
|
#}
|
|
|
## Warn about function calls with space before parens.
|
|
|
- # (Don't put a space between the name of a function and its
|
|
|
- # arguments.)
|
|
|
+ # (Don't put a space between the name of a function and its
|
|
|
+ # arguments.)
|
|
|
if (/(\w+)\s\(([A-Z]*)/) {
|
|
|
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
|
|
@@ -135,9 +135,9 @@ for $fn (@ARGV) {
|
|
|
}
|
|
|
}
|
|
|
## Warn about functions not declared at start of line.
|
|
|
- # (When you're declaring functions, put "static" and "const"
|
|
|
- # and the return type on one line, and the function name at
|
|
|
- # the start of a new line.)
|
|
|
+ # (When you're declaring functions, put "static" and "const"
|
|
|
+ # and the return type on one line, and the function name at
|
|
|
+ # the start of a new line.)
|
|
|
if ($in_func_head ||
|
|
|
($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ &&
|
|
|
! /^(?:const |static )*(?:typedef|struct|union)[^\(]*$/ &&
|
|
@@ -157,24 +157,24 @@ for $fn (@ARGV) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- ## Check for forbidden functions except when they are
|
|
|
- # explicitly permitted
|
|
|
- if (/\bassert\(/ && not /assert OK/) {
|
|
|
- print "assert :$fn:$. (use tor_assert)\n";
|
|
|
- }
|
|
|
- if (/\bmemcmp\(/ && not /memcmp OK/) {
|
|
|
- print "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n";
|
|
|
- }
|
|
|
- # always forbidden.
|
|
|
- if (not / OVERRIDE /) {
|
|
|
- if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
|
|
|
- print "$& :$fn:$.\n";
|
|
|
- }
|
|
|
- if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
|
|
|
- /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
|
|
|
- print "$& :$fn:$. (use tor_malloc, tor_free, etc)\n";
|
|
|
- }
|
|
|
- }
|
|
|
+ ## Check for forbidden functions except when they are
|
|
|
+ # explicitly permitted
|
|
|
+ if (/\bassert\(/ && not /assert OK/) {
|
|
|
+ print "assert :$fn:$. (use tor_assert)\n";
|
|
|
+ }
|
|
|
+ if (/\bmemcmp\(/ && not /memcmp OK/) {
|
|
|
+ print "memcmp :$fn:$. (use {tor,fast}_mem{eq,neq,cmp}\n";
|
|
|
+ }
|
|
|
+ # always forbidden.
|
|
|
+ if (not /\ OVERRIDE\ /) {
|
|
|
+ if (/\bstrcat\(/ or /\bstrcpy\(/ or /\bsprintf\(/) {
|
|
|
+ print "$& :$fn:$.\n";
|
|
|
+ }
|
|
|
+ if (/\bmalloc\(/ or /\bfree\(/ or /\brealloc\(/ or
|
|
|
+ /\bstrdup\(/ or /\bstrndup\(/ or /\bcalloc\(/) {
|
|
|
+ print "$& :$fn:$. (use tor_malloc, tor_free, etc)\n";
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
## Warn if the file doesn't end with a blank line.
|
|
@@ -184,4 +184,3 @@ for $fn (@ARGV) {
|
|
|
}
|
|
|
close(F);
|
|
|
}
|
|
|
-
|