Skip to content

Commit 1908bbf

Browse files
Format queries and tests
1 parent ae1afef commit 1908bbf

6 files changed

+19
-7
lines changed

c/misra/src/rules/RULE-1-5/FunctionTypesNotInPrototypeFormObsolete.ql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import cpp
1616
import codingstandards.c.misra
1717
import codingstandards.cpp.rules.functiontypesnotinprototypeformshared.FunctionTypesNotInPrototypeFormShared
1818

19-
class FunctionTypesNotInPrototypeFormObsoleteQuery extends FunctionTypesNotInPrototypeFormSharedSharedQuery {
19+
class FunctionTypesNotInPrototypeFormObsoleteQuery extends FunctionTypesNotInPrototypeFormSharedSharedQuery
20+
{
2021
FunctionTypesNotInPrototypeFormObsoleteQuery() {
2122
this = Language4Package::functionTypesNotInPrototypeFormObsoleteQuery()
2223
}

c/misra/src/rules/RULE-1-5/MissingStaticSpecifierFuncRedeclarationObsolete.ql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import cpp
1616
import codingstandards.c.misra
1717
import codingstandards.cpp.rules.missingstaticspecifierfunctionredeclarationshared.MissingStaticSpecifierFunctionRedeclarationShared
1818

19-
class MissingStaticSpecifierFuncRedeclarationObsoleteQuery extends MissingStaticSpecifierFunctionRedeclarationSharedSharedQuery {
19+
class MissingStaticSpecifierFuncRedeclarationObsoleteQuery extends MissingStaticSpecifierFunctionRedeclarationSharedSharedQuery
20+
{
2021
MissingStaticSpecifierFuncRedeclarationObsoleteQuery() {
2122
this = Language4Package::missingStaticSpecifierFuncRedeclarationObsoleteQuery()
2223
}

c/misra/src/rules/RULE-1-5/MissingStaticSpecifierObjectRedeclarationObsolete.ql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import cpp
1616
import codingstandards.c.misra
1717
import codingstandards.cpp.rules.missingstaticspecifierobjectredeclarationshared.MissingStaticSpecifierObjectRedeclarationShared
1818

19-
class MissingStaticSpecifierObjectRedeclarationObsoleteQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery {
19+
class MissingStaticSpecifierObjectRedeclarationObsoleteQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery
20+
{
2021
MissingStaticSpecifierObjectRedeclarationObsoleteQuery() {
2122
this = Language4Package::missingStaticSpecifierObjectRedeclarationObsoleteQuery()
2223
}

c/misra/src/rules/RULE-8-8/MissingStaticSpecifierObjectRedeclarationC.ql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import cpp
1616
import codingstandards.c.misra
1717
import codingstandards.cpp.rules.missingstaticspecifierobjectredeclarationshared.MissingStaticSpecifierObjectRedeclarationShared
1818

19-
class MissingStaticSpecifierObjectRedeclarationCQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery {
19+
class MissingStaticSpecifierObjectRedeclarationCQuery extends MissingStaticSpecifierObjectRedeclarationSharedSharedQuery
20+
{
2021
MissingStaticSpecifierObjectRedeclarationCQuery() {
2122
this = Declarations5Package::missingStaticSpecifierObjectRedeclarationCQuery()
2223
}
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
| test.c:40:3:40:8 | call to ungetc | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:38:16:38:20 | call to fopen | call to fopen |
1+
edges
2+
| test.c:38:16:38:20 | call to fopen indirection | test.c:40:15:40:18 | file indirection |
3+
nodes
4+
| test.c:38:16:38:20 | call to fopen indirection | semmle.label | call to fopen indirection |
5+
| test.c:40:15:40:18 | file indirection | semmle.label | file indirection |
6+
subpaths
7+
#select
8+
| test.c:40:15:40:18 | file indirection | test.c:38:16:38:20 | call to fopen indirection | test.c:40:15:40:18 | file indirection | Obsolescent call to ungetc on file stream $@ at position zero. | test.c:38:16:38:20 | call to fopen indirection | call to fopen indirection |

c/misra/test/rules/RULE-1-5/test.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ _Atomic int g3 = ATOMIC_VAR_INIT(18); // NON-COMPLIANT
2929
_Atomic int g4 = 18; // COMPLIANT
3030

3131
// `gets` was removed from C11.
32-
extern char* gets(FILE *stream);
32+
extern char *gets(FILE *stream);
3333

3434
// Rule 21.6 covers the below cases:
3535
void f6(void) {
@@ -41,6 +41,7 @@ void f6(void) {
4141

4242
char buf[10];
4343
fread(buf, sizeof(buf), 10, file);
44-
// This is not an obsolete usage of ungetc, though ungetc isn't allowed by 21-3.
44+
// This is not an obsolete usage of ungetc, though ungetc isn't allowed by
45+
// 21-3.
4546
ungetc('c', file); // COMPLIANT
4647
}

0 commit comments

Comments
 (0)