scripts/checkpatch.pl: Bug fix

Commit 2b9aef6fcd96ba7ed8c1ee723e391901852d344c introduced a regression:
checkpatch.pl started complaining about the following valid pattern:
do {
     /* something */
} while (condition);

Fix the script to once again permit this pattern.

Signed-off-by: Su Hang <suhang16@mails.ucas.ac.cn>
Message-Id: <1522029982-4650-1-git-send-email-suhang16@mails.ucas.ac.cn>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 57daae05ea181ca3aac849e434255e89d2f7445e..d52207a3cc9d813925712cd066422482a8236e68 100755 (executable)
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2356,6 +2356,18 @@ sub process {
 # check for missing bracing around if etc
                if ($line =~ /(^.*)\b(?:if|while|for)\b/ &&
                        $line !~ /\#\s*if/) {
+                       my $allowed = 0;
+
+                       # Check the pre-context.
+                       if ($line =~ /(\}.*?)$/) {
+                               my $pre = $1;
+
+                               if ($line !~ /else/) {
+                                       print "APW: ALLOWED: pre<$pre> line<$line>\n"
+                                               if $dbg_adv_apw;
+                                       $allowed = 1;
+                               }
+                       }
                        my ($level, $endln, @chunks) =
                                ctx_statement_full($linenr, $realcnt, 1);
                         if ($dbg_adv_apw) {
@@ -2364,7 +2376,6 @@ sub process {
                                 if $#chunks >= 1;
                         }
                        if ($#chunks >= 0 && $level == 0) {
-                               my $allowed = 0;
                                my $seen = 0;
                                my $herectx = $here . "\n";
                                my $ln = $linenr - 1;
@@ -2408,7 +2419,7 @@ sub process {
                                             $allowed = 1;
                                        }
                                }
-                               if ($seen != ($#chunks + 1)) {
+                               if ($seen != ($#chunks + 1) && !$allowed) {
                                        ERROR("braces {} are necessary for all arms of this statement\n" . $herectx);
                                }
                        }