Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1259410 > unrolled thread
| Started by | shailendra.v@samsung.com |
|---|---|
| First post | 2015-10-30 12:30 +0100 |
| Last post | 2015-10-30 20:10 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH] scripts:checkpatch - correct the error message during check shailendra.v@samsung.com - 2015-10-30 12:30 +0100
Re: [PATCH] scripts:checkpatch - correct the error message during check Andy Whitcroft <apw@canonical.com> - 2015-10-30 14:00 +0100
Re: [PATCH] scripts:checkpatch - correct the error message during check Joe Perches <joe@perches.com> - 2015-10-30 16:30 +0100
[PATCH] checkpatch: Improve the unnecessary initialisers tests Joe Perches <joe@perches.com> - 2015-10-30 20:10 +0100
| From | shailendra.v@samsung.com |
|---|---|
| Date | 2015-10-30 12:30 +0100 |
| Subject | [PATCH] scripts:checkpatch - correct the error message during check |
| Message-ID | <qpg2C-5bX-9@gated-at.bofh.it> |
From: Shailendra Verma <shailendra.v@samsung.com>
Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
---
scripts/checkpatch.pl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c5ec977..b2436d3 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 $1\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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Andy Whitcroft <apw@canonical.com> |
|---|---|
| Date | 2015-10-30 14:00 +0100 |
| Subject | Re: [PATCH] scripts:checkpatch - correct the error message during check |
| Message-ID | <qphrI-5Uv-1@gated-at.bofh.it> |
| In reply to | #1259410 |
On Fri, Oct 30, 2015 at 04:55:04PM +0530, shailendra.v@samsung.com wrote:
> From: Shailendra Verma <shailendra.v@samsung.com>
>
> Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
> ---
> scripts/checkpatch.pl | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index c5ec977..b2436d3 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 $1\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;/;
> }
> }
I guess that looks ok. Joe you don't know of anyone relying on the form
of the error do you (I do not)?
-apw
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Joe Perches <joe@perches.com> |
|---|---|
| Date | 2015-10-30 16:30 +0100 |
| Subject | Re: [PATCH] scripts:checkpatch - correct the error message during check |
| Message-ID | <qpjMS-7uG-3@gated-at.bofh.it> |
| In reply to | #1259481 |
On Fri, 2015-10-30 at 12:56 +0000, Andy Whitcroft wrote:
> On Fri, Oct 30, 2015 at 04:55:04PM +0530, shailendra.v@samsung.com wrote:
> > From: Shailendra Verma <shailendra.v@samsung.com>
[]
> > 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 $1\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;/;
> > }
> > }
>
> I guess that looks ok. Joe you don't know of anyone relying on the form
> of the error do you (I do not)?
I do not.
If these are changed, perhaps making the tests
"((?:0[xX]|)0+$Int_type?|NULL|false)"
might catch a couple more of these;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Joe Perches <joe@perches.com> |
|---|---|
| Date | 2015-10-30 20:10 +0100 |
| Subject | [PATCH] checkpatch: Improve the unnecessary initialisers tests |
| Message-ID | <qpndM-1fI-29@gated-at.bofh.it> |
| In reply to | #1259481 |
Global and static variables don't need to be initialized to 0.
There is already a test for this but the output message doesn't
mention booleans initialized to false.
Improve the output message and the test by adding various forms
with possible specific integer types and possible multiple zeros.
Miscellanea:
o Use a variable to hold the possible 0 test
Signed-off-by: Shailendra Verma <shailendra.v@samsung.com>
Signed-off-by: Joe Perches <joe@perches.com>
---
scripts/checkpatch.pl | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 2d88cbf9..2b3c228 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -370,6 +370,8 @@ our $typeTypedefs = qr{(?x:
$typeKernelTypedefs\b
)};
+our $zero_initializer = qr{(?:(?:0[xX])?0+$Int_type?|NULL|false)\b};
+
our $logFunctions = qr{(?x:
printk(?:_ratelimited|_once|)|
(?:[a-z0-9]+_){1,2}(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)|
@@ -3334,21 +3336,20 @@ 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*($zero_initializer)\s*;/) {
if (ERROR("GLOBAL_INITIALISERS",
- "do not initialise globals to 0 or NULL\n" .
- $herecurr) &&
+ "do not initialise globals to $1\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*$zero_initializer\s*;/$1;/;
}
}
# check for static initialisers.
- if ($line =~ /^\+.*\bstatic\s.*=\s*(0|NULL|false)\s*;/) {
+ if ($line =~ /^\+.*\bstatic\s.*=\s*($zero_initializer)\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*$zero_initializer\s*;/$1;/;
}
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web