[lttng-dev] [PATCH lttng-tools] Extras: Perl 5.26 requires { to be escaped by \

[lttng-dev] [PATCH lttng-tools] Extras: Perl 5.26 requires { to be escaped by \

[Anders Wallin via lttng-dev]

Unescaped literal "{" characters in regular expression patterns are no
longer permissible

Signed-off-by: Anders Wallin <wallinux@gmail.com>
---
 extras/checkpatch.pl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extras/checkpatch.pl b/extras/checkpatch.pl
index 286c94de..14e16fae 100755
--- a/extras/checkpatch.pl
+++ b/extras/checkpatch.pl
@@ -2433,8 +2433,8 @@ sub process {
 
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
-		if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
-		    !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {
+		if (($line=~/$Type\s*$Ident\(.*\).*\s\{/) and
+		    !($line=~/\#\s*define.*do\s\{/) and !($line=~/\}/)) {
 			ERROR("OPEN_BRACE",
 			      "open brace '{' following function declarations go on the next line\n" . $herecurr);
 		}
@@ -2709,8 +2709,8 @@ sub process {
 ## 		}
 
 #need space before brace following if, while, etc
-		if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
-		    $line =~ /do{/) {
+		if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
+		    $line =~ /do\{/) {
 			ERROR("SPACING",
 			      "space required before the open brace '{'\n" . $herecurr);
 		}
@@ -3005,7 +3005,7 @@ sub process {
 			    $dstat !~ /^for\s*$Constant$/ &&				# for (...)
 			    $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&	# for (...) bar()
 			    $dstat !~ /^do\s*{/ &&					# do {...
-			    $dstat !~ /^\({/)						# ({...
+			    $dstat !~ /^\(\{/)						# ({...
 			{
 				$ctx =~ s/\n*$//;
 				my $herectx = $here . "\n";
-- 
2.29.2

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Re: [lttng-dev] [PATCH lttng-tools] Extras: Perl 5.26 requires { to be escaped by \

[Jérémie Galarneau via lttng-dev]

Merged in master.

Thanks!
Jérémie

On Wed, 25 Nov 2020 at 03:31, Anders Wallin via lttng-dev
<lttng-dev@lists.lttng.org> wrote:
>
> Unescaped literal "{" characters in regular expression patterns are no
> longer permissible
>
> Signed-off-by: Anders Wallin <wallinux@gmail.com>
> ---
>  extras/checkpatch.pl | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/extras/checkpatch.pl b/extras/checkpatch.pl
> index 286c94de..14e16fae 100755
> --- a/extras/checkpatch.pl
> +++ b/extras/checkpatch.pl
> @@ -2433,8 +2433,8 @@ sub process {
>
>  # function brace can't be on same line, except for #defines of do while,
>  # or if closed on same line
> -               if (($line=~/$Type\s*$Ident\(.*\).*\s{/) and
> -                   !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {
> +               if (($line=~/$Type\s*$Ident\(.*\).*\s\{/) and
> +                   !($line=~/\#\s*define.*do\s\{/) and !($line=~/\}/)) {
>                         ERROR("OPEN_BRACE",
>                               "open brace '{' following function declarations go on the next line\n" . $herecurr);
>                 }
> @@ -2709,8 +2709,8 @@ sub process {
>  ##             }
>
>  #need space before brace following if, while, etc
> -               if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
> -                   $line =~ /do{/) {
> +               if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
> +                   $line =~ /do\{/) {
>                         ERROR("SPACING",
>                               "space required before the open brace '{'\n" . $herecurr);
>                 }
> @@ -3005,7 +3005,7 @@ sub process {
>                             $dstat !~ /^for\s*$Constant$/ &&                            # for (...)
>                             $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&   # for (...) bar()
>                             $dstat !~ /^do\s*{/ &&                                      # do {...
> -                           $dstat !~ /^\({/)                                           # ({...
> +                           $dstat !~ /^\(\{/)                                          # ({...
>                         {
>                                 $ctx =~ s/\n*$//;
>                                 my $herectx = $here . "\n";
> --
> 2.29.2
>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev@lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev