2016-04-21 19:41:42

by Joe Perches

[permalink] [raw]
Subject: [PATCH] checkpatch: Add test for keywords not starting on tabstops

It's somewhat common and in general a defect for c90 keywords to
not start on a tabstop.

Add a test for this condition and warn when it occurs.

Signed-off-by: Joe Perches <[email protected]>
---
scripts/checkpatch.pl | 13 +++++++++++++
1 file changed, 13 insertions(+)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index e3d9c34..6c1213c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2755,6 +2755,19 @@ sub process {
"Logical continuations should be on the previous line\n" . $hereprev);
}

+# check indentation starts on a tab stop
+ if ($^V && $^V ge 5.10.0 &&
+ $sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$))/) {
+ my $indent = length($1);
+ if ($indent % 8) {
+ if (WARN("TABSTOP",
+ "Statements should start on a tabstop\n" . $herecurr) &&
+ $fix) {
+ $fixed[$fixlinenr] =~ s@(^\+\t+) +@$1 . "\t" x ($indent/8)@e;
+ }
+ }
+ }
+
# check multi-line statement indentation matches previous line
if ($^V && $^V ge 5.10.0 &&
$prevline =~ /^\+([ \t]*)((?:$c90_Keywords(?:\s+if)\s*)|(?:$Declare\s*)?(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*|$Ident\s*=\s*$Ident\s*)\(.*(\&\&|\|\||,)\s*$/) {
--
2.8.0.rc4.16.g56331f8


2018-01-05 08:37:52

by Sven Eckelmann

[permalink] [raw]
Subject: Re: checkpatch: Add test for keywords not starting on tabstops

On Donnerstag, 21. April 2016 12:41:37 CET Joe Perches wrote:
> It's somewhat common and in general a defect for c90 keywords to
> not start on a tabstop.
>
> Add a test for this condition and warn when it occurs.

This seems to create some new false positives:

WARNING: Statements should start on a tabstop
#919: FILE: ./net/batman-adv/sysfs.c:919:
+ char ifname[IFNAMSIZ])

total: 0 errors, 1 warnings, 0 checks, 1251 lines checked

The code at this position is:

/**
* batadv_store_mesh_iface_finish() - store new hardif mesh_iface state
* @net_dev: netdevice to add/remove to/from batman-adv soft-interface
* @ifname: name of soft-interface to modify
*
* Changes the parts of the hard+soft interface which can not be modified under
* sysfs lock (to prevent deadlock situations).
*
* Return: 0 on success, 0 < on failure
*/
static int batadv_store_mesh_iface_finish(struct net_device *net_dev,
char ifname[IFNAMSIZ])
{
struct net *net = dev_net(net_dev);


I know, my mail client is most likely mangling the tabs - so better check
https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/tree/net/batman-adv/sysfs.c?id=72deacce011bde7475c90e6ee7d4c7d28c384873#n918

Problem seems to be the [IFNAMSIZ]

Kind regards,
Sven


Attachments:
signature.asc (833.00 B)
This is a digitally signed message part.

2018-01-05 08:44:11

by Sven Eckelmann

[permalink] [raw]
Subject: Re: [B.A.T.M.A.N.] checkpatch: Add test for keywords not starting on tabstops

On Freitag, 5. Januar 2018 09:30:27 CET Sven Eckelmann wrote:
> On Donnerstag, 21. April 2016 12:41:37 CET Joe Perches wrote:
> > It's somewhat common and in general a defect for c90 keywords to
> > not start on a tabstop.
> >
> > Add a test for this condition and warn when it occurs.
>
> This seems to create some new false positives:
>
> WARNING: Statements should start on a tabstop
> #919: FILE: ./net/batman-adv/sysfs.c:919:
> + char ifname[IFNAMSIZ])
>
> total: 0 errors, 1 warnings, 0 checks, 1251 lines checked
[...]

Grml, just noticed that I've replied to the wrong mail. This was of course introduced by
http://lkml.kernel.org/r/1b5f97673f36595956ad43329f77bf1a5546d2ff.1513976662.git.joe@perches.com
and not by this patch.

Kind regards,
Sven


Attachments:
signature.asc (833.00 B)
This is a digitally signed message part.