On Fri, Oct 30, 2015 at 04:55:04PM +0530, [email protected] wrote: > From: Shailendra Verma <[email protected]> > > 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..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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
