summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--util/check-format-test-negatives.c4
-rwxr-xr-xutil/check-format.pl1
2 files changed, 5 insertions, 0 deletions
diff --git a/util/check-format-test-negatives.c b/util/check-format-test-negatives.c
index 4d925572c4..58a1f59e6c 100644
--- a/util/check-format-test-negatives.c
+++ b/util/check-format-test-negatives.c
@@ -70,6 +70,10 @@ int f(void) /*
;
for (i = 0; i < 1;)
;
+ for (;;)
+ for (; i < n; i++)
+ for (;; p++)
+ ;
for (;;) ; /* should not trigger: space before ';' */
lab: ; /* should not trigger: space before ';' */
diff --git a/util/check-format.pl b/util/check-format.pl
index 705455020d..9fcebb4382 100755
--- a/util/check-format.pl
+++ b/util/check-format.pl
@@ -677,6 +677,7 @@ while (<>) { # loop over all lines of all input files
$intra_line =~ s/\s+$//; # strip any (resulting) space at EOL
$intra_line =~ s/(for\s*\([^;]*);;(\))/"$1$2"/eg; # strip trailing ';;' in for (;;)
$intra_line =~ s/(for\s*\([^;]+;[^;]+);(\))/"$1$2"/eg; # strip trailing ';' in for (;;)
+ $intra_line =~ s/(for\s*\();(;)/"$1$2"/eg; # replace leading ';;' in for (;;) by ';'
$intra_line =~ s/(=\s*)\{ /"$1@ "/eg; # do not report {SPC in initializers such as ' = { 0, };'
$intra_line =~ s/, \};/, @;/g; # do not report SPC} in initializers such as ' = { 0, };'
report("space before '$1'") if $intra_line =~ m/[\w)\]]\s+(\+\+|--)/; # postfix ++/-- with preceding space