Commit 9c9ba34e authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds

update checkpatch.pl to version 0.18

This version brings a few fixes for the extern checks, and a couple of
new checks.

Of note:
 - false is now recognised as a 0 assignment in static/external
   assignments,
 - printf format strings including %L are reported,
 - a number of fixes for the extern in .c file detector which had
   temporarily lost its ability to detect variables; undetected due to
   the loss of its test.

Andy Whitcroft (8):
      Version: 0.18
      false should trip 0 assignment checks
      tests: reinstate missing tests
      tests: allow specification of the file extension for a test
      fix extern checks for variables
      check for and report %Lu, %Ld, and %Li
      ensure we only start a statement on lines with some content
      extern spacing
Signed-off-by: default avatarAndy Whitcroft <apw@shadowen.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 171ae1a4
...@@ -9,7 +9,7 @@ use strict; ...@@ -9,7 +9,7 @@ use strict;
my $P = $0; my $P = $0;
$P =~ s@.*/@@g; $P =~ s@.*/@@g;
my $V = '0.17'; my $V = '0.18';
use Getopt::Long qw(:config no_auto_abbrev); use Getopt::Long qw(:config no_auto_abbrev);
...@@ -1144,7 +1144,7 @@ sub process { ...@@ -1144,7 +1144,7 @@ sub process {
# Check for potential 'bare' types # Check for potential 'bare' types
my ($stat, $cond); my ($stat, $cond);
if ($realcnt) { if ($realcnt && $line =~ /.\s*\S/) {
($stat, $cond) = ctx_statement_block($linenr, ($stat, $cond) = ctx_statement_block($linenr,
$realcnt, 0); $realcnt, 0);
$stat =~ s/\n./\n /g; $stat =~ s/\n./\n /g;
...@@ -1316,12 +1316,12 @@ sub process { ...@@ -1316,12 +1316,12 @@ sub process {
} }
# check for external initialisers. # check for external initialisers.
if ($line =~ /^.$Type\s*$Ident\s*=\s*(0|NULL);/) { if ($line =~ /^.$Type\s*$Ident\s*=\s*(0|NULL|false)\s*;/) {
ERROR("do not initialise externals to 0 or NULL\n" . ERROR("do not initialise externals to 0 or NULL\n" .
$herecurr); $herecurr);
} }
# check for static initialisers. # check for static initialisers.
if ($line =~ /\s*static\s.*=\s*(0|NULL);/) { if ($line =~ /\s*static\s.*=\s*(0|NULL|false)\s*;/) {
ERROR("do not initialise statics to 0 or NULL\n" . ERROR("do not initialise statics to 0 or NULL\n" .
$herecurr); $herecurr);
} }
...@@ -1973,7 +1973,7 @@ sub process { ...@@ -1973,7 +1973,7 @@ sub process {
# check for new externs in .c files. # check for new externs in .c files.
if ($realfile =~ /\.c$/ && defined $stat && if ($realfile =~ /\.c$/ && defined $stat &&
$stat =~ /^.(?:extern\s+)?$Type\s+$Ident(\s*)\(/s) $stat =~ /^.\s*(?:extern\s+)?$Type\s+$Ident(\s*)\(/s)
{ {
my $paren_space = $1; my $paren_space = $1;
...@@ -1988,6 +1988,11 @@ sub process { ...@@ -1988,6 +1988,11 @@ sub process {
if ($paren_space =~ /\n/) { if ($paren_space =~ /\n/) {
WARN("arguments for function declarations should follow identifier\n" . $herecurr); WARN("arguments for function declarations should follow identifier\n" . $herecurr);
} }
} elsif ($realfile =~ /\.c$/ && defined $stat &&
$stat =~ /^.\s*extern\s+/)
{
WARN("externs should be avoided in .c files\n" . $herecurr);
} }
# checks for new __setup's # checks for new __setup's
...@@ -2033,6 +2038,16 @@ sub process { ...@@ -2033,6 +2038,16 @@ sub process {
{ {
WARN("usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr); WARN("usage of NR_CPUS is often wrong - consider using cpu_possible(), num_possible_cpus(), for_each_possible_cpu(), etc\n" . $herecurr);
} }
# check for %L{u,d,i} in strings
my $string;
while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
$string = substr($rawline, $-[1], $+[1] - $-[1]);
if ($string =~ /(?<!%)%L[udi]/) {
WARN("\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
last;
}
}
} }
# If we have no input at all, then there is nothing to report on # If we have no input at all, then there is nothing to report on
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment