mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 02:30:34 +02:00 
			
		
		
		
	checkpatch: fix left brace warning
Using checkpatch.pl with Perl 5.22.0 generates the following warning:
    Unescaped left brace in regex is deprecated, passed through in regex;
This patch fixes the warnings by escaping occurrences of the left brace
inside the regular expression.
Signed-off-by: Eddie Kovsky <ewk@edkovsky.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
			
			
This commit is contained in:
		
							parent
							
								
									bf4daf12a9
								
							
						
					
					
						commit
						4e5d56bdf8
					
				
					 1 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
					@ -3571,7 +3571,7 @@ sub process {
 | 
				
			||||||
# function brace can't be on same line, except for #defines of do while,
 | 
					# function brace can't be on same line, except for #defines of do while,
 | 
				
			||||||
# or if closed on same line
 | 
					# or if closed on same line
 | 
				
			||||||
		if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and
 | 
							if (($line=~/$Type\s*$Ident\(.*\).*\s*{/) and
 | 
				
			||||||
		    !($line=~/\#\s*define.*do\s{/) and !($line=~/}/)) {
 | 
							    !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
 | 
				
			||||||
			if (ERROR("OPEN_BRACE",
 | 
								if (ERROR("OPEN_BRACE",
 | 
				
			||||||
				  "open brace '{' following function declarations go on the next line\n" . $herecurr) &&
 | 
									  "open brace '{' following function declarations go on the next line\n" . $herecurr) &&
 | 
				
			||||||
			    $fix) {
 | 
								    $fix) {
 | 
				
			||||||
| 
						 | 
					@ -4083,8 +4083,8 @@ sub process {
 | 
				
			||||||
## 		}
 | 
					## 		}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#need space before brace following if, while, etc
 | 
					#need space before brace following if, while, etc
 | 
				
			||||||
		if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
 | 
							if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) ||
 | 
				
			||||||
		    $line =~ /do{/) {
 | 
							    $line =~ /do\{/) {
 | 
				
			||||||
			if (ERROR("SPACING",
 | 
								if (ERROR("SPACING",
 | 
				
			||||||
				  "space required before the open brace '{'\n" . $herecurr) &&
 | 
									  "space required before the open brace '{'\n" . $herecurr) &&
 | 
				
			||||||
			    $fix) {
 | 
								    $fix) {
 | 
				
			||||||
| 
						 | 
					@ -4531,7 +4531,7 @@ sub process {
 | 
				
			||||||
			    $dstat !~ /^for\s*$Constant$/ &&				# for (...)
 | 
								    $dstat !~ /^for\s*$Constant$/ &&				# for (...)
 | 
				
			||||||
			    $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&	# for (...) bar()
 | 
								    $dstat !~ /^for\s*$Constant\s+(?:$Ident|-?$Constant)$/ &&	# for (...) bar()
 | 
				
			||||||
			    $dstat !~ /^do\s*{/ &&					# do {...
 | 
								    $dstat !~ /^do\s*{/ &&					# do {...
 | 
				
			||||||
			    $dstat !~ /^\({/ &&						# ({...
 | 
								    $dstat !~ /^\(\{/ &&						# ({...
 | 
				
			||||||
			    $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
 | 
								    $ctx !~ /^.\s*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				$ctx =~ s/\n*$//;
 | 
									$ctx =~ s/\n*$//;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue