Skip to content

Commit 67caf3b

Browse files
nashifdanieldegrasse
authored andcommitted
sca: eclair: use MISRA C:2012 Amendment 2
Use MISRA C:2012 Amendment 2 instead of 'MISRA C:2012 Amendment 2' in all configuration files consistently. Also fix a typo in one of the deviations. Signed-off-by: Anas Nashif <anas.nashif@intel.com>
1 parent a9574c1 commit 67caf3b

10 files changed

+382
-382
lines changed

cmake/sca/eclair/ECL/adopted_deviations.ecl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
-report_selector+={adopted_report,"all_area(!kind(culprit||evidence)||all_loc(all_exp(adopted||pseudo)))"}
55

66
-doc_begin="Adopted code is not meant to be read, reviewed or modified by human programmers:no developers' confusion is not possible. In addition, adopted code is assumed to work as is. Reports that are fully contained in adopted code are hidden/tagged with the 'adopted' tag."
7-
-config=MC3R1.R7.2,reports+={relied,adopted_report}
8-
-config=MC3R1.R10.3,reports+={relied,adopted_report}
9-
-config=MC3R1.R10.6,reports+={relied,adopted_report}
10-
-config=MC3R1.R12.1,reports+={relied,adopted_report}
7+
-config=MC3A2.R7.2,reports+={relied,adopted_report}
8+
-config=MC3A2.R10.3,reports+={relied,adopted_report}
9+
-config=MC3A2.R10.6,reports+={relied,adopted_report}
10+
-config=MC3A2.R12.1,reports+={relied,adopted_report}
1111
-doc_end
1212

1313
-doc_begin="Macro LOAPIC_BASE_ADDRESS, automatically generated by Autoconf, expands to an implicitly unsigned literal lacking the 'u' or 'U' suffix."
14-
-config=MC3R1.R7.2,reports+={safe,"all_area(all_loc(any_exp(macro(^assert$))))"}
14+
-config=MC3A2.R7.2,reports+={safe,"all_area(all_loc(any_exp(macro(^assert$))))"}
1515
-doc_end
1616

1717
-doc="#include_next is a documented GNU preprocessing directive. See section \"2.7 Wrapper Headers\" of "CPP_MANUAL""
@@ -21,23 +21,23 @@
2121

2222
-doc="The declarations in files tagged with api:public define a public API of Zephyr.
2323
Declarations in these files not necessarily have to be referenced."
24-
-config=MC3R1.R2.3,declarations+={safe,"loc(top(public()))"}
24+
-config=MC3A2.R2.3,declarations+={safe,"loc(top(public()))"}
2525

2626
-doc="Library entry points not necessarily have to be referenced."
27-
-config=MC3R1.R2.1,declarations+={safe,"loc(top(public()))"}
27+
-config=MC3A2.R2.1,declarations+={safe,"loc(top(public()))"}
2828

2929
-doc="Library entry points not necessarily have to be referenced in more than one translation units."
30-
-config=MC3R1.R8.7,declarations+={safe,"loc(top(public()))"}
30+
-config=MC3A2.R8.7,declarations+={safe,"loc(top(public()))"}
3131

3232
-doc="Syscall declarations are automatically generated all with the extern qualifier. For the ones with internal linkage the use of the extern qualifier is a violation of rule 8.8."
33-
-config=MC3R1.R8.8,declarations={relied, "^z_vrfy_.*$||^z_impl_.*$"}
33+
-config=MC3A2.R8.8,declarations={relied, "^z_vrfy_.*$||^z_impl_.*$"}
3434

3535
-doc="Function hash, that is automatically generated, does not use the parameter \"len\" in all its definitions."
36-
-config=MC3R1.R2.7,declarations+={relied,"context(^hash\\(const char\\*, size_t\\)$)&&name(len)"}
36+
-config=MC3A2.R2.7,declarations+={relied,"context(^hash\\(const char\\*, size_t\\)$)&&name(len)"}
3737

3838
-doc="Function \"z_object_lookup\", that is automatically generated, uses single-statement bodies not enclosed in braces."
39-
-config=MC3R1.R15.6,reports={relied, "all_area(context(^z_object_lookup\\(const char\\*, size_t\\)$))"}
39+
-config=MC3A2.R15.6,reports={relied, "all_area(context(^z_object_lookup\\(const char\\*, size_t\\)$))"}
4040

4141
-doc="The following declarations are in generated files: not in all configuration they are implemented.
4242
Chainging the generators could be dangerous and the advantages in enforcing the rule do not outweight these dangers."
43-
-config=MC3R1.R8.6,declarations+={safe, "loc(top(file(^zephyr/build/zephyr/include/generated/.*$)))"}
43+
-config=MC3A2.R8.6,declarations+={safe, "loc(top(file(^zephyr/build/zephyr/include/generated/.*$)))"}

cmake/sca/eclair/ECL/analysis_STU.ecl

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -10,106 +10,106 @@
1010

1111
-doc_begin="Selection of guidelines from
1212
https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
13-
-enable=MC3R1.D4.13
14-
-enable=MC3R1.D4.2
15-
-enable=MC3R1.D4.4
16-
-enable=MC3R1.D4.5
17-
-enable=MC3R1.D4.8
18-
-enable=MC3R1.D4.11
19-
-enable=MC3R1.D4.12
20-
-enable=MC3R1.D4.14
21-
-enable=MC3R1.D4.7
22-
-enable=MC3R1.R10.5
23-
-enable=MC3R1.R10.2
24-
-enable=MC3R1.R10.6
25-
-enable=MC3R1.R10.7
26-
-enable=MC3R1.R10.8
27-
-enable=MC3R1.R1.2
28-
-enable=MC3R1.R1.3
29-
-enable=MC3R1.R12.4
30-
-enable=MC3R1.R12.5
31-
-enable=MC3R1.R12.2
32-
-enable=MC3R1.R13.4
33-
-enable=MC3R1.R13.1
34-
-enable=MC3R1.R13.2
35-
-enable=MC3R1.R13.5
36-
-enable=MC3R1.R13.6
37-
-enable=MC3R1.R18.5
38-
-enable=MC3R1.R18.1
39-
-enable=MC3R1.R18.2
40-
-enable=MC3R1.R18.3
41-
-enable=MC3R1.R18.6
42-
-enable=MC3R1.R18.8
43-
-enable=MC3R1.R21.11
44-
-enable=MC3R1.R21.13
45-
-enable=MC3R1.R21.17
46-
-enable=MC3R1.R21.18
47-
-enable=MC3R1.R21.19
48-
-enable=MC3R1.R21.20
49-
-enable=MC3R1.R2.7
50-
-enable=MC3R1.R2.2
51-
-enable=MC3R1.R4.2
52-
-enable=MC3R1.R4.1
53-
-enable=MC3R1.R17.3
54-
-enable=MC3R1.R17.4
55-
-enable=MC3R1.R17.6
56-
-enable=MC3R1.R17.1
57-
-enable=MC3R1.R17.5
58-
-enable=MC3R1.R19.1
59-
-enable=MC3R1.R22.2
60-
-enable=MC3R1.R22.5
61-
-enable=MC3R1.R22.6
62-
-enable=MC3R1.R9.1
63-
-enable=MC3R1.R9.2
64-
-enable=MC3R1.R9.3
65-
-enable=MC3R1.R9.4
66-
-enable=MC3R1.R9.5
67-
-enable=MC3R1.D2.1
68-
-enable=MC3R1.R11.2
69-
-enable=MC3R1.R11.6
70-
-enable=MC3R1.R11.7
71-
-enable=MC3R1.R11.8
72-
-enable=MC3R1.R11.9
73-
-enable=MC3R1.R14.1
74-
-enable=MC3R1.R14.2
75-
-enable=MC3R1.R14.3
76-
-enable=MC3R1.R15.2
77-
-enable=MC3R1.R15.3
78-
-enable=MC3R1.R15.6
79-
-enable=MC3R1.R15.7
80-
-enable=MC3R1.R16.1
81-
-enable=MC3R1.R16.2
82-
-enable=MC3R1.R16.3
83-
-enable=MC3R1.R16.4
84-
-enable=MC3R1.R16.5
85-
-enable=MC3R1.R16.6
86-
-enable=MC3R1.R16.7
87-
-enable=MC3R1.R20.11
88-
-enable=MC3R1.R20.12
89-
-enable=MC3R1.R20.13
90-
-enable=MC3R1.R20.14
91-
-enable=MC3R1.R20.2
92-
-enable=MC3R1.R20.3
93-
-enable=MC3R1.R20.4
94-
-enable=MC3R1.R20.8
95-
-enable=MC3R1.R20.9
96-
-enable=MC3R1.R3.1
97-
-enable=MC3R1.R3.2
98-
-enable=MC3R1.R5.2
99-
-enable=MC3R1.R5.3
100-
-enable=MC3R1.R5.4
101-
-enable=MC3R1.R5.5
102-
-enable=MC3R1.R6.1
103-
-enable=MC3R1.R6.2
104-
-enable=MC3R1.R7.1
105-
-enable=MC3R1.R7.2
106-
-enable=MC3R1.R7.3
107-
-enable=MC3R1.R7.4
108-
-enable=MC3R1.R8.1
109-
-enable=MC3R1.R8.10
110-
-enable=MC3R1.R8.12
111-
-enable=MC3R1.R8.14
112-
-enable=MC3R1.R8.2
113-
-enable=MC3R1.R8.4
114-
-enable=MC3R1.R8.8
13+
-enable=MC3A2.D4.13
14+
-enable=MC3A2.D4.2
15+
-enable=MC3A2.D4.4
16+
-enable=MC3A2.D4.5
17+
-enable=MC3A2.D4.8
18+
-enable=MC3A2.D4.11
19+
-enable=MC3A2.D4.12
20+
-enable=MC3A2.D4.14
21+
-enable=MC3A2.D4.7
22+
-enable=MC3A2.R10.5
23+
-enable=MC3A2.R10.2
24+
-enable=MC3A2.R10.6
25+
-enable=MC3A2.R10.7
26+
-enable=MC3A2.R10.8
27+
-enable=MC3A2.R1.2
28+
-enable=MC3A2.R1.3
29+
-enable=MC3A2.R12.4
30+
-enable=MC3A2.R12.5
31+
-enable=MC3A2.R12.2
32+
-enable=MC3A2.R13.4
33+
-enable=MC3A2.R13.1
34+
-enable=MC3A2.R13.2
35+
-enable=MC3A2.R13.5
36+
-enable=MC3A2.R13.6
37+
-enable=MC3A2.R18.5
38+
-enable=MC3A2.R18.1
39+
-enable=MC3A2.R18.2
40+
-enable=MC3A2.R18.3
41+
-enable=MC3A2.R18.6
42+
-enable=MC3A2.R18.8
43+
-enable=MC3A2.R21.11
44+
-enable=MC3A2.R21.13
45+
-enable=MC3A2.R21.17
46+
-enable=MC3A2.R21.18
47+
-enable=MC3A2.R21.19
48+
-enable=MC3A2.R21.20
49+
-enable=MC3A2.R2.7
50+
-enable=MC3A2.R2.2
51+
-enable=MC3A2.R4.2
52+
-enable=MC3A2.R4.1
53+
-enable=MC3A2.R17.3
54+
-enable=MC3A2.R17.4
55+
-enable=MC3A2.R17.6
56+
-enable=MC3A2.R17.1
57+
-enable=MC3A2.R17.5
58+
-enable=MC3A2.R19.1
59+
-enable=MC3A2.R22.2
60+
-enable=MC3A2.R22.5
61+
-enable=MC3A2.R22.6
62+
-enable=MC3A2.R9.1
63+
-enable=MC3A2.R9.2
64+
-enable=MC3A2.R9.3
65+
-enable=MC3A2.R9.4
66+
-enable=MC3A2.R9.5
67+
-enable=MC3A2.D2.1
68+
-enable=MC3A2.R11.2
69+
-enable=MC3A2.R11.6
70+
-enable=MC3A2.R11.7
71+
-enable=MC3A2.R11.8
72+
-enable=MC3A2.R11.9
73+
-enable=MC3A2.R14.1
74+
-enable=MC3A2.R14.2
75+
-enable=MC3A2.R14.3
76+
-enable=MC3A2.R15.2
77+
-enable=MC3A2.R15.3
78+
-enable=MC3A2.R15.6
79+
-enable=MC3A2.R15.7
80+
-enable=MC3A2.R16.1
81+
-enable=MC3A2.R16.2
82+
-enable=MC3A2.R16.3
83+
-enable=MC3A2.R16.4
84+
-enable=MC3A2.R16.5
85+
-enable=MC3A2.R16.6
86+
-enable=MC3A2.R16.7
87+
-enable=MC3A2.R20.11
88+
-enable=MC3A2.R20.12
89+
-enable=MC3A2.R20.13
90+
-enable=MC3A2.R20.14
91+
-enable=MC3A2.R20.2
92+
-enable=MC3A2.R20.3
93+
-enable=MC3A2.R20.4
94+
-enable=MC3A2.R20.8
95+
-enable=MC3A2.R20.9
96+
-enable=MC3A2.R3.1
97+
-enable=MC3A2.R3.2
98+
-enable=MC3A2.R5.2
99+
-enable=MC3A2.R5.3
100+
-enable=MC3A2.R5.4
101+
-enable=MC3A2.R5.5
102+
-enable=MC3A2.R6.1
103+
-enable=MC3A2.R6.2
104+
-enable=MC3A2.R7.1
105+
-enable=MC3A2.R7.2
106+
-enable=MC3A2.R7.3
107+
-enable=MC3A2.R7.4
108+
-enable=MC3A2.R8.1
109+
-enable=MC3A2.R8.10
110+
-enable=MC3A2.R8.12
111+
-enable=MC3A2.R8.14
112+
-enable=MC3A2.R8.2
113+
-enable=MC3A2.R8.4
114+
-enable=MC3A2.R8.8
115115
-doc_end

cmake/sca/eclair/ECL/analysis_WP.ecl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010

1111
-doc_begin="Selection of guidelines from
1212
https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
13-
-enable=MC3R1.R2.3
14-
-enable=MC3R1.R2.1
15-
-enable=MC3R1.R5.9
16-
-enable=MC3R1.R5.1
17-
-enable=MC3R1.R5.6
18-
-enable=MC3R1.R5.7
19-
-enable=MC3R1.R5.8
20-
-enable=MC3R1.R8.9
21-
-enable=MC3R1.R8.3
22-
-enable=MC3R1.R8.5
23-
-enable=MC3R1.R8.6
24-
-enable=MC3R1.R22.4
25-
-enable=MC3R1.R22.3
26-
-enable=MC3R1.D1.1
27-
-enable=MC3R1.D3.1
28-
-enable=MC3R1.D4.1
29-
-enable=MC3R1.D4.10
30-
-enable=MC3R1.R17.2
31-
-enable=MC3R1.R17.7
13+
-enable=MC3A2.R2.3
14+
-enable=MC3A2.R2.1
15+
-enable=MC3A2.R5.9
16+
-enable=MC3A2.R5.1
17+
-enable=MC3A2.R5.6
18+
-enable=MC3A2.R5.7
19+
-enable=MC3A2.R5.8
20+
-enable=MC3A2.R8.9
21+
-enable=MC3A2.R8.3
22+
-enable=MC3A2.R8.5
23+
-enable=MC3A2.R8.6
24+
-enable=MC3A2.R22.4
25+
-enable=MC3A2.R22.3
26+
-enable=MC3A2.D1.1
27+
-enable=MC3A2.D3.1
28+
-enable=MC3A2.D4.1
29+
-enable=MC3A2.D4.10
30+
-enable=MC3A2.R17.2
31+
-enable=MC3A2.R17.7
3232
-doc_end

cmake/sca/eclair/ECL/analysis_first_analysis.ecl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
-doc_begin="Selection of guidelines from
1212
https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
13-
-enable=MC3R1.R8.2
14-
-enable=MC3R1.R10.2
15-
-enable=MC3R1.R10.5
16-
-enable=MC3R1.R10.6
17-
-enable=MC3R1.R11.2
18-
-enable=MC3R1.R12.4
19-
-enable=MC3R1.R13.4
20-
-enable=MC3R1.R16.1
13+
-enable=MC3A2.R8.2
14+
-enable=MC3A2.R10.2
15+
-enable=MC3A2.R10.5
16+
-enable=MC3A2.R10.6
17+
-enable=MC3A2.R11.2
18+
-enable=MC3A2.R12.4
19+
-enable=MC3A2.R13.4
20+
-enable=MC3A2.R16.1
2121
-doc_end

cmake/sca/eclair/ECL/analysis_heavy_STU.ecl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
-doc_begin="Selection of guidelines from
1212
https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
13-
-enable=MC3R1.D4.6
14-
-enable=MC3R1.D4.9
15-
-enable=MC3R1.R12.1
16-
-enable=MC3R1.R13.3
17-
-enable=MC3R1.R2.6
18-
-enable=MC3R1.R10.1
19-
-enable=MC3R1.R10.3
20-
-enable=MC3R1.R10.4
21-
-enable=MC3R1.R14.4
22-
-enable=MC3R1.R20.7
13+
-enable=MC3A2.D4.6
14+
-enable=MC3A2.D4.9
15+
-enable=MC3A2.R12.1
16+
-enable=MC3A2.R13.3
17+
-enable=MC3A2.R2.6
18+
-enable=MC3A2.R10.1
19+
-enable=MC3A2.R10.3
20+
-enable=MC3A2.R10.4
21+
-enable=MC3A2.R14.4
22+
-enable=MC3A2.R20.7
2323
-doc_end

cmake/sca/eclair/ECL/analysis_std_lib.ecl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99

1010
-doc_begin="Selection of guidelines from
1111
https://docs.zephyrproject.org/latest/contribute/coding_guidelines/index.html"
12-
-enable=MC3R1.R21.1
13-
-enable=MC3R1.R21.12
14-
-enable=MC3R1.R21.14
15-
-enable=MC3R1.R21.15
16-
-enable=MC3R1.R21.16
17-
-enable=MC3R1.R21.2
18-
-enable=MC3R1.R21.3
19-
-enable=MC3R1.R21.4
20-
-enable=MC3R1.R21.6
21-
-enable=MC3R1.R21.7
22-
-enable=MC3R1.R21.9
23-
-enable=MC3R1.R22.1
24-
-enable=MC3R1.R22.10
25-
-enable=MC3R1.R22.7
26-
-enable=MC3R1.R22.8
27-
-enable=MC3R1.R22.9
12+
-enable=MC3A2.R21.1
13+
-enable=MC3A2.R21.12
14+
-enable=MC3A2.R21.14
15+
-enable=MC3A2.R21.15
16+
-enable=MC3A2.R21.16
17+
-enable=MC3A2.R21.2
18+
-enable=MC3A2.R21.3
19+
-enable=MC3A2.R21.4
20+
-enable=MC3A2.R21.6
21+
-enable=MC3A2.R21.7
22+
-enable=MC3A2.R21.9
23+
-enable=MC3A2.R22.1
24+
-enable=MC3A2.R22.10
25+
-enable=MC3A2.R22.7
26+
-enable=MC3A2.R22.8
27+
-enable=MC3A2.R22.9
2828
-doc_end

0 commit comments

Comments
 (0)