From: Martin Kletzander <mkletzan@redhat.com>
Date: Thu, 13 Nov 2014 14:04:52 +0000 (+0100)
Subject: bracket-spacing: Don't modify current line
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d697de90c02b16a017666dbefcf46f4390601920;p=libvirt.git

bracket-spacing: Don't modify current line

In bracket-spacing.pl, the current $line is being modified in $data.
That, however, spoils that $data for another check.  Introduce new
$tmpdata variable that can be used for temporary modifications.  The
difference between $data and $line is that $data are as much cleaned as
possible from non-code blocks and these changes must be kept.

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

diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl
index ac01a56fe8..5fce2b786c 100755
--- a/build-aux/bracket-spacing.pl
+++ b/build-aux/bracket-spacing.pl
@@ -31,6 +31,8 @@ foreach my $file (@ARGV) {
 
     while (defined (my $line = <FILE>)) {
         my $data = $line;
+        # For temporary modifications
+        my $tmpdata;
 
         # Kill any quoted , ; = or "
         $data =~ s/'[";,=]'/'X'/g;
@@ -77,12 +79,15 @@ foreach my $file (@ARGV) {
         #
         #  foo (*bar, wizz);
         #
-        while ($data =~ /(\w+)\s\((?!\*)/) {
+        # We also don't want to spoil the $data so it can be used
+        # later on.
+        $tmpdata = $data;
+        while ($tmpdata =~ /(\w+)\s\((?!\*)/) {
             my $kw = $1;
 
             # Allow space after keywords only
             if ($kw =~ /^(if|for|while|switch|return)$/) {
-                $data =~ s/($kw\s\()/XXX(/;
+                $tmpdata =~ s/($kw\s\()/XXX(/;
             } else {
                 print "$file:$.: $line";
                 $ret = 1;
@@ -147,9 +152,10 @@ foreach my $file (@ARGV) {
 
         # Require spaces around assignment '=', compounds and '=='
         # with the exception of virAssertCmpInt()
-        $data =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/;
-        while ($data =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ ||
-               $data =~ /=[^= \\\n]/) {
+        $tmpdata = $data;
+        $tmpdata =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/;
+        while ($tmpdata =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ ||
+               $tmpdata =~ /=[^= \\\n]/) {
             print "$file:$.: $line";
             $ret = 1;
             last;