Ignore strings with an escaped double quote too.
This removes the need for special handling of quotes in the
semicolon check.
---
build-aux/bracket-spacing.pl | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl
index fbe6666..a99edeb 100755
--- a/build-aux/bracket-spacing.pl
+++ b/build-aux/bracket-spacing.pl
@@ -31,8 +31,8 @@ foreach my $file (@ARGV) {
while (defined (my $line = <FILE>)) {
my $data = $line;
- # Kill any quoted strongs
- $data =~ s,".*?","XXX",g;
+ # Kill any quoted strings
+ $data =~ s,"([^\\\"]|\\.)+","XXX",g;
# Kill any C++ style comments
$data =~ s,//.*$,//,;
@@ -120,14 +120,9 @@ foreach my $file (@ARGV) {
# errno == EINTR)
# ;
#
- # 3) ";" is inside double-quote, I.e, as part of const string. E.g.
- # printf("%s", "a ; b\n");
while ($data =~ /[^;\s]\s+;/) {
- # Inside the double-quote
- if ($data !~ /"[^"]*\s;/) {
- print "$file:$.: $line";
- $ret = 1;
- }
+ print "$file:$.: $line";
+ $ret = 1;
last;
}
}
--
1.8.1.5
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
