OSDN Git Service

checkpatch: fix incompatibility with old perl
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Wed, 4 Oct 2017 15:44:20 +0000 (18:44 +0300)
committerStefan Hajnoczi <stefanha@redhat.com>
Thu, 5 Oct 2017 14:22:44 +0000 (10:22 -0400)
Do not use '/r' modifier which was introduced in perl 5.14.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Fixes: 3e5875afc0f ("checkpatch: check trace-events code style")
Tested-by: Alex Williamson <alex.williamson@redhat.com>
Message-id: 20171004154420.34596-1-vsementsov@virtuozzo.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
scripts/checkpatch.pl

index 3c0a28e..0c41f12 100755 (executable)
@@ -1432,7 +1432,8 @@ sub process {
                                        qr/%[-+ *.0-9]*([hljztL]|ll|hh)?(x|X|"\s*PRI[xX][^"]*"?)/;
 
                                # don't consider groups splitted by [.:/ ], like 2A.20:12ab
-                               my $tmpline = $rawline =~ s/($hex[.:\/ ])+$hex//gr;
+                               my $tmpline = $rawline;
+                               $tmpline =~ s/($hex[.:\/ ])+$hex//g;
 
                                if ($tmpline =~ /(?<!0x)$hex/) {
                                        ERROR("Hex numbers must be prefixed with '0x'\n" .