2015-06-05 13:55:37

by Shailendra Verma

[permalink] [raw]
Subject: [PATCH] scripts:checkpatch - correct the error message during check

Signed-off-by: Shailendra Verma <[email protected]>
---
scripts/checkpatch.pl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c5ec977..b59f356 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3169,21 +3169,21 @@ sub process {
}

# check for global initialisers.
- if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0|NULL|false)\s*;/) {
+ if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0x0|0|NULL|false)\s*;/) {
if (ERROR("GLOBAL_INITIALISERS",
- "do not initialise globals to 0 or NULL\n" .
+ "do not initialise globals to $2\n" .
$herecurr) &&
$fix) {
- $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*(0|NULL|false)\s*;/$1;/;
+ $fixed[$fixlinenr] =~ s/(^.$Type\s*$Ident(?:\s+$Modifier)*)\s*=\s*(0x0|0|NULL|false)\s*;/$1;/;
}
}
# check for static initialisers.
- if ($line =~ /^\+.*\bstatic\s.*=\s*(0|NULL|false)\s*;/) {
+ if ($line =~ /^\+.*\bstatic\s.*=\s*(0x0|0|NULL|false)\s*;/) {
if (ERROR("INITIALISED_STATIC",
- "do not initialise statics to 0 or NULL\n" .
+ "do not initialise statics to $1\n" .
$herecurr) &&
$fix) {
- $fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*(0|NULL|false)\s*;/$1;/;
+ $fixed[$fixlinenr] =~ s/(\bstatic\s.*?)\s*=\s*(0x0|0|NULL|false)\s*;/$1;/;
}
}

--
1.9.1


2015-06-05 15:16:01

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] scripts:checkpatch - correct the error message during check

On Fri, 2015-06-05 at 19:25 +0530, Shailendra Verma wrote:
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -3169,21 +3169,21 @@ sub process {
> }
>
> # check for global initialisers.
> - if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0|NULL|false)\s*;/) {
> + if ($line =~ /^\+$Type\s*$Ident(?:\s+$Modifier)*\s*=\s*(?:0x0|0|NULL|false)\s*;/) {
> if (ERROR("GLOBAL_INITIALISERS",
> - "do not initialise globals to 0 or NULL\n" .
> + "do not initialise globals to $2\n" .

The first capture group in the old and broken regex
was unnecessary and was removed so s/$2/$1/

2015-06-05 15:40:37

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH] scripts:checkpatch - correct the error message during check

On Fri, 2015-06-05 at 21:01 +0530, Shailendra Verma wrote:
> Sorry i could not understand the point as i am not very good in Perl.

Is anyone very good at perl?

> Are you saying that we need to change ?
> > - "do not initialise globals to 0 or NULL\n" .
> > + "do not initialise globals to s/$2/$1/\n"

"do not initialise globals to $1\n"