[PATCH] scripts:checkpatch - correct the error message during

[PATCH] scripts:checkpatch - correct the error message during

[Shailendra Verma]

Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>
---
 scripts/checkpatch.pl | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 89b1df4..ac98ee8 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3169,21 +3169,21 @@ sub process {
 		}
 
 # check for global initialisers.
-		if ($line =~ /^\+(\s*$Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/) {
+		if ($line =~ /^\+(\s*$Type\s*$Ident\s*(?:\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*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/$1;/;
+				$fixed[$fixlinenr] =~ s/($Type\s*$Ident\s*(?:\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

Re: [PATCH] scripts:checkpatch - correct the error message during

[Joe Perches]

On Thu, 2015-06-04 at 20:56 +0530, Shailendra Verma wrote:
> Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com>

Please redo this using the most current version
from the linux-next tree.

> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -3169,21 +3169,21 @@ sub process {
>  		}
>  
>  # check for global initialisers.
> -		if ($line =~ /^\+(\s*$Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0|NULL|false)\s*;/) {
> +		if ($line =~ /^\+(\s*$Type\s*$Ident\s*(?:\s+$Modifier))*\s*=\s*(0x0|0|NULL|false)\s*;/) {

This has changed.

Re: [PATCH] scripts:checkpatch - correct the error message during

[Joe Perches]

On Thu, 2015-06-04 at 22:25 +0530, Shailendra Verma wrote:
> Hello Joe,
> 
> Is it the latest revision of checkpatch.pl?
> 
> https://git.kernel.org/cgit/linux/kernel/git/apw/checkpatch.git/tree/scripts/checkpatch.pl?h=next

Well, it should be here, but Andrew Morton hasn't
pushed it to -next yet.

git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/scripts/checkpatch.pl

This is the patch:

http://ozlabs.org/~akpm/mmots/broken-out/checkpatch-fix-global_initialisers-test.patch