Messages in this thread Patch in this message | | | Subject | Re: [PATCH] scripts:checkpatch - correct the error message during check | From | Joe Perches <> | Date | Fri, 30 Oct 2015 08:29:46 -0700 |
| |
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;
| |