| Message ID | 20220902111923.1488671-1-mic@digikod.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8ea0114eda0c1c85f8f01922ac8fc1e489a61129 |
| Headers | show |
| Series | [v2] checkpatch: Handle FILE pointer type | expand |
On Fri, 2022-09-02 at 13:19 +0200, Mickaël Salaün wrote: > When using a "FILE *" type, checkpatch considers this an error: > ERROR: need consistent spacing around '*' (ctx:WxV) > #32: FILE: f.c:8: > +static void a(FILE *const b) [] > Signed-off-by: Mickaël Salaün <mic@digikod.net> Acked-by: Joe Perches <joe@perches.com> > Link: https://lore.kernel.org/r/20220902111923.1488671-1-mic@digikod.net > --- > Changes since v1: > https://lore.kernel.org/r/20220901145948.1456353-1-mic@digikod.net > * Remove the FIXTURE_{DATA,VARIANT}() comments. > * Improve commit description. > --- > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl [] > @@ -576,10 +576,14 @@ our $typeKernelTypedefs = qr{(?x: > (?:__)?(?:u|s|be|le)(?:8|16|32|64)| > atomic_t > )}; > +our $typeStdioTypedefs = qr{(?x: > + FILE > +)}; > our $typeTypedefs = qr{(?x: > $typeC99Typedefs\b| > $typeOtherOSTypedefs\b| > - $typeKernelTypedefs\b > + $typeKernelTypedefs\b| > + $typeStdioTypedefs\b > )}; > > our $zero_initializer = qr{(?:(?:0[xX])?0+$Int_type?|NULL|false)\b}; > > base-commit: b90cb1053190353cc30f0fef0ef1f378ccc063c5
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 79e759aac543..e2175102a354 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -576,10 +576,14 @@ our $typeKernelTypedefs = qr{(?x: (?:__)?(?:u|s|be|le)(?:8|16|32|64)| atomic_t )}; +our $typeStdioTypedefs = qr{(?x: + FILE +)}; our $typeTypedefs = qr{(?x: $typeC99Typedefs\b| $typeOtherOSTypedefs\b| - $typeKernelTypedefs\b + $typeKernelTypedefs\b| + $typeStdioTypedefs\b )}; our $zero_initializer = qr{(?:(?:0[xX])?0+$Int_type?|NULL|false)\b};
When using a "FILE *" type, checkpatch considers this an error: ERROR: need consistent spacing around '*' (ctx:WxV) #32: FILE: f.c:8: +static void a(FILE *const b) ^ Fix this by explicitly defining "FILE" as a common type. This is useful for user space patches. With this patch, we now get: <E> <E> <_>WS( ) <E> <E> <_>IDENT(static) <E> <V> <_>WS( ) <E> <V> <_>DECLARE(void ) <E> <T> <_>FUNC(a) <E> <V> <V>PAREN('(') <EV> <N> <_>DECLARE(FILE *const ) <EV> <T> <_>IDENT(b) <EV> <V> <_>PAREN(')') -> V <E> <V> <_>WS( ) 32 > . static void a(FILE *const b) 32 > EEVVVVVVVTTTTTVNTTTTTTTTTTTTVVV 32 > ______________________________ Cc: Andy Whitcroft <apw@canonical.com> Cc: Dwaipayan Ray <dwaipayanray1@gmail.com> Cc: Joe Perches <joe@perches.com> Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com> Signed-off-by: Mickaël Salaün <mic@digikod.net> Link: https://lore.kernel.org/r/20220902111923.1488671-1-mic@digikod.net --- Changes since v1: https://lore.kernel.org/r/20220901145948.1456353-1-mic@digikod.net * Remove the FIXTURE_{DATA,VARIANT}() comments. * Improve commit description. --- scripts/checkpatch.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: b90cb1053190353cc30f0fef0ef1f378ccc063c5