bracket-spacing-check: Print out more specific error message

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl
index d1787039a622d4ca4be90ad9d9094f322de7d8b2..3d3d7d8d481e54e2d7d18b64e8fa837f3b0055e3 100755 (executable)
--- a/build-aux/bracket-spacing.pl
+++ b/build-aux/bracket-spacing.pl
@@ -89,6 +89,7 @@ foreach my $file (@ARGV) {
             if ($kw =~ /^(if|for|while|switch|return)$/) {
                 $tmpdata =~ s/($kw\s\()/XXX(/;
             } else {
+                print "Whitespace after non-keyword:\n";
                 print "$file:$.: $line";
                 $ret = 1;
                 last;
@@ -99,12 +100,14 @@ foreach my $file (@ARGV) {
         # but none after the opening bracket
         if ($data =~ /\b(if|for|while|switch|return)\(/ ||
             $data =~ /\b(if|for|while|switch|return)\s+\(\s/) {
+            print "No whitespace after keyword:\n";
             print "$file:$.: $line";
             $ret = 1;
         }
 
         # Forbid whitespace between )( of a function typedef
         if ($data =~ /\(\*\w+\)\s+\(/) {
+            print "Whitespace between ')' and '(':\n";
             print "$file:$.: $line";
             $ret = 1;
         }
@@ -112,6 +115,7 @@ foreach my $file (@ARGV) {
         # Forbid whitespace following ( or prior to )
         if ($data =~ /\S\s+\)/ ||
             $data =~ /\(\s+\S/) {
+            print "Whitespace after '(' or before ')':\n";
             print "$file:$.: $line";
             $ret = 1;
         }
@@ -127,6 +131,7 @@ foreach my $file (@ARGV) {
         #       ;
         #
         if ($data =~ /[^;\s]\s+[;,]/) {
+            print "Whitespace before (semi)colon:\n";
             print "$file:$.: $line";
             $ret = 1;
         }
@@ -134,12 +139,14 @@ foreach my $file (@ARGV) {
         # Require EOL, macro line continuation, or whitespace after ";".
         # Allow "for (;;)" as an exception.
         if ($data =~ /;[^       \\\n;)]/) {
+            print "Invalid character after semicolon:\n";
             print "$file:$.: $line";
             $ret = 1;
         }
 
         # Require EOL, space, or enum/struct end after comma.
         if ($data =~ /,[^ \\\n)}]/) {
+            print "Invalid character after comma:\n";
             print "$file:$.: $line";
             $ret = 1;
         }
@@ -150,6 +157,7 @@ foreach my $file (@ARGV) {
         $tmpdata =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/;
         if ($tmpdata =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ ||
             $tmpdata =~ /=[^= \\\n]/) {
+            print "Spacing around '=' or '==':\n";
             print "$file:$.: $line";
             $ret = 1;
         }

diff --git a/cfg.mk b/cfg.mk
index 927240b83dfab5837db11c432d1421fd66962886..f188645e20f65715138ec1980cf4484864e72d2d 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1030,7 +1030,7 @@ endif
 bracket-spacing-check:
        $(AM_V_GEN)files=`$(VC_LIST) | grep '\.c$$'`; \
        $(PERL) $(top_srcdir)/build-aux/bracket-spacing.pl $$files || \
-         { echo '$(ME): incorrect whitespace, see HACKING for rules' 1>&2; \
+         { echo '$(ME): incorrect formatting, see HACKING for rules' 1>&2; \
            exit 1; }
 
 # sc_po_check can fail if generated files are not built first