walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Ticket #7445: Properly represent integer types smaller than int in CheckIO::ArgumentInfo.

This commit is contained in:
Simon Martin 2016-05-28 15:36:13 +02:00
parent 18fc288de9
commit 12a298b9cd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/checkio.cpp
View File

@ -1389,9 +1389,7 @@ CheckIO::ArgumentInfo::ArgumentInfo(const Token * tok, const Settings *settings,
tempToken->insertToken("a"); tempToken->insertToken("a");
tempToken = tempToken->next(); tempToken = tempToken->next();
} }
if (valuetype->pointer == 0U && valuetype->type <= ValueType::INT) if (valuetype->type == ValueType::BOOL)
tempToken->str("int");
else if (valuetype->type == ValueType::BOOL)
tempToken->str("bool"); tempToken->str("bool");
else if (valuetype->type == ValueType::CHAR) else if (valuetype->type == ValueType::CHAR)
tempToken->str("char"); tempToken->str("char");

6
test/testio.cpp
View File

@ -2187,6 +2187,12 @@ private:
ASSERT_EQUALS("[test.cpp:9]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'int'.\n" ASSERT_EQUALS("[test.cpp:9]: (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'int'.\n"
"[test.cpp:9]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'float'.\n", errout.str()); "[test.cpp:9]: (warning) %u in format string (no. 2) requires 'unsigned int' but the argument type is 'float'.\n", errout.str());
// Ticket #7445
check("struct S { unsigned short x; } s = {0};\n"
"void foo() {\n"
" printf(\"%d\", s.x);\n"
"}");
ASSERT_EQUALS("", errout.str());
} }
void testPosixPrintfScanfParameterPosition() { // #4900 - No support for parameters in format strings void testPosixPrintfScanfParameterPosition() { // #4900 - No support for parameters in format strings