Re: [PATCH 1/1] checkpatch: don't fake typedefs with #define

From: Joe Perches
Date: Tue May 22 2012 - 12:48:16 EST


On Tue, 2012-05-22 at 11:01 +0300, Phil Carmody wrote:
> On 21/05/12 09:41 -0700, ext Joe Perches wrote:
> > On Mon, 2012-05-21 at 15:05 +0300, Phil Carmody wrote:
> > > +# check for deliberate avoidance of the above anti-typedef rule
> > > + if ($line =~ /#\s*define\s+$Ident\s+(enum|union|struct)\s+$Ident\b/) {
>
> > I believe this would not catch,
> >
> > #define typedeflike_define_t \
> > struct foo
> >
> > If it's deliberate, you probably want to.
> >
> > So maybe you want to move this and use
> > the $stat tests like the extern or memset
> > tests do (look around line 3200).
>
> Thanks for the pointer. This flags everything I'm interested in:
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index faea0ec..408aee0 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -3319,6 +3319,13 @@ sub process {
> "externs should be avoided in .c files\n" . $herecurr);
> }
>
> +# check for deliberate avoidance of the anti-typedef rule
> + if (defined $stat &&
> + $stat =~ /#\s*define\s+$Ident\s+(enum|union|struct)\s+$Ident\b/) {
> + WARN("NEW_TYPEDEFS",
> + "do not fake typedefs using #define\n" . $herecurr);
> + }
> +

This doesn't trigger on the example I gave you.

$ cat def_type.c
#define foo struct bar

#define foo \
struct bar

#define foo /* baz */ \
struct bar

#define foo /* baz */ \
\
struct /* baz */ bar
$

It seems for macros the $dstat variable needs to be tested.

Try this:

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index faea0ec..fc4df52 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2933,6 +2933,21 @@ sub process {
^\"|\"$
}x;
#print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
+
+# check for deliberate avoidance of the anti-typedef rule
+ if ($dstat =~ /(enum|union|struct)\s+$Ident\b/) {
+ $ctx =~ s/\n*$//;
+ my $herectx = $here . "\n";
+ my $cnt = statement_rawlines($ctx);
+
+ for (my $n = 0; $n < $cnt; $n++) {
+ $herectx .= raw_line($linenr, $n) . "\n";
+ }
+
+ WARN("NEW_TYPEDEFS",
+ "do not fake typedefs using #define\n" . $herectx);
+ }
+
if ($dstat ne '' &&
$dstat !~ /^(?:$Ident|-?$Constant),$/ && # 10, // foo(),
$dstat !~ /^(?:$Ident|-?$Constant);$/ && # foo();


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/