On 10/09/15 12:21, Nicolas Morey-Chaisemartin wrote:
It is actually already fixed in the Linux kernel.
Shoud we import the latest checkpatch then?
we should cherry-pick that change if we have real problem.
Other changes are optional, you can review them if there is reason to
apply them. Usually I do check patch update once a year or with begging
new major update. Because of all our local changes should be in updated
version also.
Regards,
Maxim.
$ git show 4e5d56bdf892e18832a6540b63ebf709966bce2a
commit 4e5d56bdf892e18832a6540b63ebf709966bce2a
Author: Eddie Kovsky <e...@edkovsky.org>
Date: Wed Sep 9 15:37:52 2015 -0700
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 <e...@edkovsky.org>
Cc: Joe Perches <j...@perches.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 577241e..ba47dab 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3571,7 +3571,7 @@ 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=~/}/)) {
+ !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
if (ERROR("OPEN_BRACE",
"open brace '{' following function declarations go on the next
line\n" . $herecurr) &&
$fix) {
@@ -4083,8 +4083,8 @@ sub process {
## }
#need space before brace following if, while, etc
- if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
- $line =~ /do{/) {
+ if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) ||
+ $line =~ /do\{/) {
if (ERROR("SPACING",
"space required before the open brace '{'\n" . $herecurr) &&
$fix) {
@@ -4531,7 +4531,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*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
{
$ctx =~ s/\n*$//;
On 10/09/2015 09:44 AM, Nicolas Morey-Chaisemartin wrote:
I guess it should. But I'm not sure where the upstream is.
It may even be fixed there.
Nicolas
On 10/08/2015 06:20 PM, Mike Holmes wrote:
Should this go upstream also ?
On 8 October 2015 at 14:46, Nicolas Morey-Chaisemartin <nmo...@kalray.eu>
wrote:
Latest Perl version marks unescaped left braces as deprecated in regexp
Unescaped left brace in regex is deprecated, passed through in regex;
marked by <-- HERE in m/\#\s*define.*do\s{ <-- HERE /
at ./scripts/checkpatch.pl line 3414.
Escape all open left braces that caused warnings
Signed-off-by: Nicolas Morey-Chaisemartin <nmo...@kalray.eu>
---
scripts/checkpatch.pl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4983a0c..893da37 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3411,7 +3411,7 @@ 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=~/}/)) {
+ !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
if (ERROR("OPEN_BRACE",
"open brace '{' following function
declarations go on the next line\n" . $herecurr) &&
$fix) {
@@ -3923,8 +3923,8 @@ sub process {
## }
#need space before brace following if, while, etc
- if (($line =~ /\(.*\){/ && $line !~ /\($Type\){/) ||
- $line =~ /do{/) {
+ if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\){/) ||
+ $line =~ /do\{/) {
if (ERROR("SPACING",
"space required before the open brace
'{'\n" . $herecurr) &&
$fix) {
@@ -4377,7 +4377,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*#\s*define\s+TRACE_(?:SYSTEM|INCLUDE_FILE|INCLUDE_PATH)\b/)
{
$ctx =~ s/\n*$//;
--
2.6.0.3.g4057e08
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
