Fix: sessiond: ust-app: assertion failure on registration of dead app

[lttng-tools.git] / extras / checkpatch.pl

diff --git a/extras/checkpatch.pl b/extras/checkpatch.pl
index fdd84849badbcd77f8536ad327a9c32f1a6ee7fd..14e16fae12cb20d0743e960dea976a63c0bf95d9 100755 (executable)
--- a/extras/checkpatch.pl
+++ b/extras/checkpatch.pl
@@ -3,7 +3,8 @@
 # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
 # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
 # (c) 2008-2010 Andy Whitcroft <apw@canonical.com>
-# Licensed under the terms of the GNU GPL License version 2
+#
+# SPDX-License-Identifier: GPL-2.0-only
 
 use strict;
 
@@ -2432,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);
                }
@@ -2708,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);
                }
@@ -3004,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";