update checkpatch.pl to version 0.15

This version brings a number of minor fixes updating the type detector and
the unary tracker.  It also brings a few small fixes for false positives.
It also reverts the --file warning.  Of note:

 - limit CVS checks to added lines
 - improved type detections
 - fixes to the unary tracker

Andy Whitcroft (13):
      Version: 0.15
      EXPORT_SYMBOL checks need to accept array variables
      export checks must match DECLARE_foo and LIST_HEAD
      possible types: cleanup debugging missing line
      values: track values through preprocessor conditional paths
      typeof is actually a type
      possible types: detect definitions which cross lines
      values: include line numbers on value debug information
      values: ensure we find correctly record pending brackets
      values: simplify the brace history stack
      CVS keyword checks should only apply to added lines
      loosen spacing for comments
      allow braces for single statement blocks with multiline conditionals

Harvey Harrison (1):
      checkpatch: remove fastcall

Ingo Molnar (1):
      checkpatch.pl: revert wrong --file message

Uwe Kleine-Koenig (1):
      fix typo "goot" -> "good"

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Joel Schopp <jschopp@austin.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 206 insertions, 117 deletions

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2086a856400a..2a7cef9726e4 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -9,7 +9,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
 
-my $V = '0.14';
+my $V = '0.15';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -105,8 +105,7 @@ our $Sparse	= qr{
                         __iomem|
                         __must_check|
                         __init_refok|
-                        __kprobes|
-                        fastcall
+                        __kprobes
                 }x;
 our $Attribute  = qr{
                         const|
@@ -158,7 +157,10 @@ sub build_types {
                         \b
                         (?:const\s+)?
                         (?:unsigned\s+)?
-                        $all
+                        (?:
+                                $all|
+                                (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)
+                        )
                         (?:\s+$Sparse|\s+const)*
                         \b
                   }x;
@@ -362,6 +364,7 @@ sub ctx_statement_block {
 
         my $type = '';
         my $level = 0;
+        my $p;
         my $c;
         my $len = 0;
 
@@ -386,6 +389,7 @@ sub ctx_statement_block {
                                 last;
                         }
                 }
+                $p = $c;
                 $c = substr($blk, $off, 1);
                 $remainder = substr($blk, $off);
 
@@ -397,8 +401,9 @@ sub ctx_statement_block {
                 }
 
                 # An else is really a conditional as long as its not else if
-                if ($level == 0 && $remainder =~ /(\s+else)(?:\s|{)/ &&
-                                        $remainder !~ /\s+else\s+if\b/) {
+                if ($level == 0 && (!defined($p) || $p =~ /(?:\s|\})/) &&
+                                $remainder =~ /(else)(?:\s|{)/ &&
+                                $remainder !~ /else\s+if\b/) {
                         $coff = $off + length($1);
                 }
 
@@ -445,21 +450,73 @@ sub ctx_statement_block {
                         $line, $remain + 1, $off - $loff + 1, $level);
 }
 
+sub statement_lines {
+        my ($stmt) = @_;
+
+        # Strip the diff line prefixes and rip blank lines at start and end.
+        $stmt =~ s/(^|\n)./$1/g;
+        $stmt =~ s/^\s*//;
+        $stmt =~ s/\s*$//;
+
+        my @stmt_lines = ($stmt =~ /\n/g);
+
+        return $#stmt_lines + 2;
+}
+
+sub statement_rawlines {
+        my ($stmt) = @_;
+
+        my @stmt_lines = ($stmt =~ /\n/g);
+
+        return $#stmt_lines + 2;
+}
+
+sub statement_block_size {
+        my ($stmt) = @_;
+
+        $stmt =~ s/(^|\n)./$1/g;
+        $stmt =~ s/^\s*{//;
+        $stmt =~ s/}\s*$//;
+        $stmt =~ s/^\s*//;
+        $stmt =~ s/\s*$//;
+
+        my @stmt_lines = ($stmt =~ /\n/g);
+        my @stmt_statements = ($stmt =~ /;/g);
+
+        my $stmt_lines = $#stmt_lines + 2;
+        my $stmt_statements = $#stmt_statements + 1;
+
+        if ($stmt_lines > $stmt_statements) {
+                return $stmt_lines;
+        } else {
+                return $stmt_statements;
+        }
+}
+
 sub ctx_statement_full {
         my ($linenr, $remain, $off) = @_;
         my ($statement, $condition, $level);
 
         my (@chunks);
 
+        # Grab the first conditional/block pair.
         ($statement, $condition, $linenr, $remain, $off, $level) =
                                 ctx_statement_block($linenr, $remain, $off);
         #print "F: c<$condition> s<$statement>\n";
+        push(@chunks, [ $condition, $statement ]);
+        if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:if|else|do)\b/s)) {
+                return ($level, $linenr, @chunks);
+        }
+
+        # Pull in the following conditional/block pairs and see if they
+        # could continue the statement.
         for (;;) {
-                push(@chunks, [ $condition, $statement ]);
-                last if (!($remain > 0 && $condition =~ /^.\s*(?:if|else|do)/));
                 ($statement, $condition, $linenr, $remain, $off, $level) =
                                 ctx_statement_block($linenr, $remain, $off);
-                #print "C: c<$condition> s<$statement>\n";
+                #print "C: c<$condition> s<$statement> remain<$remain>\n";
+                last if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:else|do)\b/s));
+                #print "C: push\n";
+                push(@chunks, [ $condition, $statement ]);
         }
 
         return ($level, $linenr, @chunks);
@@ -593,13 +650,13 @@ sub cat_vet {
 }
 
 my $av_preprocessor = 0;
-my $av_paren = 0;
+my $av_pending;
 my @av_paren_type;
 
 sub annotate_reset {
         $av_preprocessor = 0;
-        $av_paren = 0;
-        @av_paren_type = ();
+        $av_pending = '_';
+        @av_paren_type = ('E');
 }
 
 sub annotate_values {
@@ -611,12 +668,13 @@ sub annotate_values {
         print "$stream\n" if ($dbg_values > 1);
 
         while (length($cur)) {
-                print " <$type> " if ($dbg_values > 1);
+                print " <" . join('', @av_paren_type) .
+                                        "> <$type> " if ($dbg_values > 1);
                 if ($cur =~ /^(\s+)/o) {
                         print "WS($1)\n" if ($dbg_values > 1);
                         if ($1 =~ /\n/ && $av_preprocessor) {
+                                $type = pop(@av_paren_type);
                                 $av_preprocessor = 0;