]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
checkpatch: warn only on "space before semicolon" at end of line
authorJoe Perches <joe@perches.com>
Thu, 23 Jan 2014 23:54:41 +0000 (15:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jan 2014 00:36:57 +0000 (16:36 -0800)
The "space before a non-naked semicolon" test has unwanted output when
used in "for ( ;; )" loops.

Make the test work only on end-of-line statement termination semicolons.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
scripts/checkpatch.pl

index 59fa00e97878a5344e451369d1d7df241400b2ad..8efce590d4b6ea528edc63ddb10c02537c1a79c4 100755 (executable)
@@ -3121,7 +3121,7 @@ sub process {
                }
 
 # check for whitespace before a non-naked semicolon
-               if ($line =~ /^\+.*\S\s+;/) {
+               if ($line =~ /^\+.*\S\s+;\s*$/) {
                        if (WARN("SPACING",
                                 "space prohibited before semicolon\n" . $herecurr) &&
                            $fix) {