Messages in this thread | | | Subject | Re: [PATCH 2/2] checkpatch: kconfig: add missing types to regex | From | Nicolai Fischer <> | Date | Fri, 25 Dec 2020 18:27:23 +0100 |
| |
On 12/21/20 6:17 PM, Joe Perches wrote: > On Mon, 2020-12-21 at 16:08 +0100, Nicolai Fischer wrote: >> On Sun, 2020-12-20 at 20:16 +0100, Joe Perches wrote: >>> On Mon, 2020-12-14 at 11:24 +0100, Nicolai Fischer wrote: >>>> Kconfig parsing does not recognise all type attributes. >>>> This adds the missing 'int', 'sting' and 'hex' types. >>> [] >>>> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl >>> [] >>>> @@ -3321,7 +3321,7 @@ sub process { >>>> next if ($f =~ /^-/); >>>> last if (!$file && $f =~ /^\@\@/); >>>> >>>> >>>> - if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) { >>>> + if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|int|hex|string|prompt)\s*["']/) { >>>> $is_start = 1; >>>> } elsif ($lines[$ln - 1] =~ /^\+\s*help$/) { >>>> $length = -1; >>> >>> Another thing that could be done is to enforce the "extra 2 spaces" >>> indent by capturing the whitespace before the help keyword: >>> >>> } elsif ($lines[$ln - 1] =~ /^\+\s*help$/) { >>> >>> could be >>> >>> } elsif ($lines[$ln - 1] =~ /^\+(\s*)help\s*$/) { >>> >>> with $1 used to validate the extra indent. >>> >>> >> >> >> In case the indent does not match, should we display a new warning as in our previous patch? > > Sure, but in a separate patch and ensure blank lines are ignored. > > + if ($l !~ /^\ {2}/) { > + $wrong_indent = 1; > } > > The message you used: > + WARN("CONFIG_DESCRIPTION", > + "help text is not indented 2 spaces more than the help keyword\n" . $herecurr); > > is IMO a bit oddly phrased and could/should test only > the first line after the help keyword and show the help > line using $hereprev. > > The problem with $herecurr is, that it always contains the first line of the Kconfig option. The loop which actually determines if the warning is to be displayed, leaves $herecurr and likewise $hereprev unaffected.
So printing $hereprev would unfortunately not be any more helpful than $herecurr.
Because $herecurr and $hereprev also contain the line number, among other things, I am not sure what would be the best way to address this.
| |