diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 19:18:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 19:18:59 -0400 |
commit | e596c79050eafea89cf9fe26b7a807643a2a9904 (patch) | |
tree | 36a0c9b0d4cb149c2c5098be2257639631e5d6c6 /scripts/coccinelle/misc | |
parent | 51399a391940e676877c7a791138081f13a0bab7 (diff) | |
parent | 9231d9e02a1f92b52bbb1e4474bfd1903835a993 (diff) |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (39 commits)
Revert "namespace: add source file location exceptions"
Coccinelle: Add contextual message
Coccinelle: Fix documentation
Coccinelle: Find doubled arguments to boolean or bit operators.
Coccinelle: Find nested lock+irqsave functions that use the same flags variables.
namespace: add source file location exceptions
scripts/extract-ikconfig: add support for bzip2, lzma and lzo
kbuild: check return value of asprintf()
scripts/namespace.pl: improve to get more correct results
scripts/namespace.pl: some bug fixes
scripts/namespace.pl: update file exclusion list
scripts/namespace.pl: fix wrong source path
Coccinelle: Use the -no_show_diff option for org and report mode
Coccinelle: Add a new mode named 'chain'
Coccinelle: Use new comment format to explain kfree.cocci
Coccinelle: Improve user information with a new kind of comment
Coccinelle: Update documentation
MAINTAINERS: Coccinelle: Update email address
Documentation/kbuild: modules.txt cleanup
Documentation/kbuild: major edit of modules.txt sections 5-8
...
Diffstat (limited to 'scripts/coccinelle/misc')
-rw-r--r-- | scripts/coccinelle/misc/doubleinit.cocci | 53 | ||||
-rw-r--r-- | scripts/coccinelle/misc/ifcol.cocci | 48 |
2 files changed, 101 insertions, 0 deletions
diff --git a/scripts/coccinelle/misc/doubleinit.cocci b/scripts/coccinelle/misc/doubleinit.cocci new file mode 100644 index 000000000000..55d7dc19dfe0 --- /dev/null +++ b/scripts/coccinelle/misc/doubleinit.cocci | |||
@@ -0,0 +1,53 @@ | |||
1 | /// Find duplicate field initializations. This has a high rate of false | ||
2 | /// positives due to #ifdefs, which Coccinelle is not aware of in a structure | ||
3 | /// initialization. | ||
4 | /// | ||
5 | // Confidence: Low | ||
6 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
7 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
8 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
9 | // URL: http://coccinelle.lip6.fr/ | ||
10 | // Comments: | ||
11 | // Options: -no_includes -include_headers | ||
12 | |||
13 | virtual org | ||
14 | virtual report | ||
15 | |||
16 | @r@ | ||
17 | identifier I, s, fld; | ||
18 | position p0,p; | ||
19 | expression E; | ||
20 | @@ | ||
21 | |||
22 | struct I s =@p0 { ... .fld@p = E, ...}; | ||
23 | |||
24 | @s@ | ||
25 | identifier I, s, r.fld; | ||
26 | position r.p0,p; | ||
27 | expression E; | ||
28 | @@ | ||
29 | |||
30 | struct I s =@p0 { ... .fld@p = E, ...}; | ||
31 | |||
32 | @script:python depends on org@ | ||
33 | p0 << r.p0; | ||
34 | fld << r.fld; | ||
35 | ps << s.p; | ||
36 | pr << r.p; | ||
37 | @@ | ||
38 | |||
39 | if int(ps[0].line) < int(pr[0].line) or (int(ps[0].line) == int(pr[0].line) and int(ps[0].column) < int(pr[0].column)): | ||
40 | cocci.print_main(fld,p0) | ||
41 | cocci.print_secs("s",ps) | ||
42 | cocci.print_secs("r",pr) | ||
43 | |||
44 | @script:python depends on report@ | ||
45 | p0 << r.p0; | ||
46 | fld << r.fld; | ||
47 | ps << s.p; | ||
48 | pr << r.p; | ||
49 | @@ | ||
50 | |||
51 | if int(ps[0].line) < int(pr[0].line) or (int(ps[0].line) == int(pr[0].line) and int(ps[0].column) < int(pr[0].column)): | ||
52 | msg = "%s: first occurrence %s, second occurrence %s" % (fld,ps[0].line,pr[0].line) | ||
53 | coccilib.report.print_report(p0[0],msg) | ||
diff --git a/scripts/coccinelle/misc/ifcol.cocci b/scripts/coccinelle/misc/ifcol.cocci new file mode 100644 index 000000000000..b7ed91dbeb95 --- /dev/null +++ b/scripts/coccinelle/misc/ifcol.cocci | |||
@@ -0,0 +1,48 @@ | |||
1 | /// Find confusingly indented code in or after an if. An if branch should | ||
2 | /// be indented. The code following an if should not be indented. | ||
3 | /// Sometimes, code after an if that is indented is actually intended to be | ||
4 | /// part of the if branch. | ||
5 | /// | ||
6 | /// This has a high rate of false positives, because Coccinelle's column | ||
7 | /// calculation does not distinguish between spaces and tabs, so code that | ||
8 | /// is not visually aligned may be considered to be in the same column. | ||
9 | /// | ||
10 | // Confidence: Low | ||
11 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
12 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
13 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
14 | // URL: http://coccinelle.lip6.fr/ | ||
15 | // Comments: | ||
16 | // Options: -no_includes -include_headers | ||
17 | |||
18 | virtual org | ||
19 | virtual report | ||
20 | |||
21 | @r disable braces4@ | ||
22 | position p1,p2; | ||
23 | statement S1,S2; | ||
24 | @@ | ||
25 | |||
26 | ( | ||
27 | if (...) { ... } | ||
28 | | | ||
29 | if (...) S1@p1 S2@p2 | ||
30 | ) | ||
31 | |||
32 | @script:python depends on org@ | ||
33 | p1 << r.p1; | ||
34 | p2 << r.p2; | ||
35 | @@ | ||
36 | |||
37 | if (p1[0].column == p2[0].column): | ||
38 | cocci.print_main("branch",p1) | ||
39 | cocci.print_secs("after",p2) | ||
40 | |||
41 | @script:python depends on report@ | ||
42 | p1 << r.p1; | ||
43 | p2 << r.p2; | ||
44 | @@ | ||
45 | |||
46 | if (p1[0].column == p2[0].column): | ||
47 | msg = "code aligned with following code on line %s" % (p2[0].line) | ||
48 | coccilib.report.print_report(p1[0],msg) | ||