diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-06 16:10:42 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-06 16:10:42 +0100 |
| commit | 1d9295b344a885e5a79de38df28740a1db6f6103 (patch) | |
| tree | ca427bbf13a04f3480fb398630473bede4ef6463 /scripts | |
| parent | 736a74ba7a1c3983105b92a709c263e206fe3913 (diff) | |
| parent | 6face0e8ab8d97dcc7284a8a5d7ae1f4d134798f (diff) | |
| download | barebox-1d9295b344a885e5a79de38df28740a1db6f6103.tar.gz barebox-1d9295b344a885e5a79de38df28740a1db6f6103.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/checkpatch.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 8d96434650..f3fd3395f1 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2013,8 +2013,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 '{' following function declarations go on the next line\n" . $herecurr); } @@ -2264,8 +2264,8 @@ sub process { ## } #need space before brace following if, while, etc - if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) || - $line =~ /do{/) { + if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) || + $line =~ /do\{/) { ERROR("space required before the open brace '{'\n" . $herecurr); } |