From 2950eb08cb9f1dd62cdefa490d5e4f5aedf0c7e2 Mon Sep 17 00:00:00 2001 From: Robert Reif Date: Thu, 29 Aug 2013 05:49:16 +0200 Subject: [PATCH] CheckIO: fix some %I64 related false positives. Ticket: #4964 --- lib/checkio.cpp | 40 ++++++++----- test/testio.cpp | 151 ++++++++++++++++++++++++++---------------------- 2 files changed, 107 insertions(+), 84 deletions(-) diff --git a/lib/checkio.cpp b/lib/checkio.cpp index 581c3eb85..be9085009 100644 --- a/lib/checkio.cpp +++ b/lib/checkio.cpp @@ -597,12 +597,14 @@ void CheckIO::checkWrongPrintfScanfArguments() specifier += *i; if (functionInfo && varTypeTok && ((varTypeTok->isStandardType() || functionInfo->retType) && varTypeTok->next()->str() != "*")) { if (!Token::Match(varTypeTok, "bool|short|long|int|char|size_t") || - (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong())))) { + (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong()))) || + (specifier.find("I64") != std::string::npos && (varTypeTok->str() != "long" || !varTypeTok->isLong()))) { invalidPrintfArgTypeError_int(tok, numFormat, specifier); } } else if (variableInfo && varTypeTok && isKnownType(variableInfo, varTypeTok) && !variableInfo->isPointer() && !variableInfo->isArray()) { if (!Token::Match(varTypeTok, "bool|short|long|int|char|size_t") || - (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong())))) { + (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong()))) || + (specifier.find("I64") != std::string::npos && (varTypeTok->str() != "long" || !varTypeTok->isLong()))) { invalidPrintfArgTypeError_int(tok, numFormat, specifier); } } else if (argListTok->type() == Token::eString) { @@ -615,12 +617,14 @@ void CheckIO::checkWrongPrintfScanfArguments() specifier += *i; if (functionInfo && varTypeTok && (varTypeTok->isStandardType() || functionInfo->retType) && varTypeTok->next()->str() != "*") { if (((varTypeTok->isUnsigned() || !Token::Match(varTypeTok, "bool|short|long|int")) && varTypeTok->str() != "char") || - (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong())))) { + (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong()))) || + (specifier.find("I64") != std::string::npos && (varTypeTok->str() != "long" || !varTypeTok->isLong()))) { invalidPrintfArgTypeError_sint(tok, numFormat, specifier); } } else if (variableInfo && varTypeTok && isKnownType(variableInfo, varTypeTok) && !variableInfo->isPointer() && !variableInfo->isArray()) { if (((varTypeTok->isUnsigned() || !Token::Match(varTypeTok, "bool|short|long|int")) && varTypeTok->str() != "char") || - (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong())))) { + (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong()))) || + (specifier.find("I64") != std::string::npos && (varTypeTok->str() != "long" || !varTypeTok->isLong()))) { invalidPrintfArgTypeError_sint(tok, numFormat, specifier); } } else if (argListTok->type() == Token::eString) { @@ -632,12 +636,14 @@ void CheckIO::checkWrongPrintfScanfArguments() specifier += *i; if (functionInfo && varTypeTok && ((varTypeTok->isStandardType() || functionInfo->retType) || varTypeTok->next()->str() != "*")) { if (((!varTypeTok->isUnsigned() || !Token::Match(varTypeTok, "char|short|long|int|size_t")) && varTypeTok->str() != "bool") || - (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong())))) { + (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong()))) || + (specifier.find("I64") != std::string::npos && (varTypeTok->str() != "long" || !varTypeTok->isLong()))) { invalidPrintfArgTypeError_uint(tok, numFormat, specifier); } } else if (variableInfo && varTypeTok && isKnownType(variableInfo, varTypeTok) && !variableInfo->isPointer() && !variableInfo->isArray()) { if (((!varTypeTok->isUnsigned() || !Token::Match(varTypeTok, "char|short|long|int|size_t")) && varTypeTok->str() != "bool") || - (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong())))) { + (specifier[0] == 'l' && (varTypeTok->str() != "long" || (specifier[1] == 'l' && !varTypeTok->isLong()))) || + (specifier.find("I64") != std::string::npos && (varTypeTok->str() != "long" || !varTypeTok->isLong()))) { invalidPrintfArgTypeError_uint(tok, numFormat, specifier); } } else if (argListTok->type() == Token::eString) { @@ -899,19 +905,25 @@ void CheckIO::invalidPrintfArgTypeError_int(const Token* tok, unsigned int numFo void CheckIO::invalidPrintfArgTypeError_uint(const Token* tok, unsigned int numFormat, const std::string& specifier) { std::ostringstream errmsg; - errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires an unsigned " - << (specifier[0] == 'l' ? "long " : "") - << (specifier[0] == 'l' && specifier[1] == 'l' ? "long " : "") - << "integer given in the argument list."; + errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires an unsigned "; + if (specifier.find("I64") != std::string::npos) + errmsg << "long long "; + else + errmsg << (specifier[0] == 'l' ? "long " : "") + << (specifier[0] == 'l' && specifier[1] == 'l' ? "long " : ""); + errmsg << "integer given in the argument list."; reportError(tok, Severity::warning, "invalidPrintfArgType_uint", errmsg.str()); } void CheckIO::invalidPrintfArgTypeError_sint(const Token* tok, unsigned int numFormat, const std::string& specifier) { std::ostringstream errmsg; - errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires a signed " - << (specifier[0] == 'l' ? "long " : "") - << (specifier[0] == 'l' && specifier[1] == 'l' ? "long " : "") - << "integer given in the argument list."; + errmsg << "%" << specifier << " in format string (no. " << numFormat << ") requires a signed "; + if (specifier.find("I64") != std::string::npos) + errmsg << "long long "; + else + errmsg << (specifier[0] == 'l' ? "long " : "") + << (specifier[0] == 'l' && specifier[1] == 'l' ? "long " : ""); + errmsg << "integer given in the argument list."; reportError(tok, Severity::warning, "invalidPrintfArgType_sint", errmsg.str()); } void CheckIO::invalidPrintfArgTypeError_float(const Token* tok, unsigned int numFormat, const std::string& specifier) diff --git a/test/testio.cpp b/test/testio.cpp index baeb87202..1485279f7 100644 --- a/test/testio.cpp +++ b/test/testio.cpp @@ -817,105 +817,116 @@ private: "[test.cpp:13]: (warning) %f in format string (no. 5) requires a floating point number given in the argument list.\n" "[test.cpp:13]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n", errout.str()); - check("short s() { return 0; }\n" - "short * ps() { return 0; }\n" - "unsigned short us() { return 0; }\n" - "unsigned short * pus() { return 0; }\n" - "int i() { return 0; }\n" - "int * pi() { return 0; }\n" - "unsigned int ui() { return 0; }\n" - "unsigned int * pui() { return 0; }\n" - "long l() { return 0; }\n" - "long * pl() { return 0; }\n" - "unsigned long ul() { return 0; }\n" - "unsigned long * pul() { return 0; }\n" - "float f() { return 0; }\n" - "float * pf() { return 0; }\n" - "double d() { return 0; }\n" - "double * pd() { return 0; }\n" - "long double ld() { return 0; }\n" - "long double * pld() { return 0; }\n" - "void foo() {\n" - " printf(\"%d %p %u %p %d %p %u %p %ld %p %lu %p %f %p %f %p %lf %p\",\n" - " s(), ps(), us(), pus(),\n" - " i(), pi(), ui(), pui(),\n" - " l(), pl(), ul(), upl(),\n" - " f(), pf(), d(), pd(), ld(), pld());\n" - "}"); - ASSERT_EQUALS("", errout.str()); - check("short f() { return 0; }\n" - "void foo() { printf(\"%u %lu %f %lf %p\", f(), f(), f(), f(), f()); }"); - ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 1) requires an unsigned integer given in the argument list.\n" - "[test.cpp:2]: (warning) %lu in format string (no. 2) requires an unsigned long integer given in the argument list.\n" - "[test.cpp:2]: (warning) %f in format string (no. 3) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 4) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 5) requires an address given in the argument list.\n", errout.str()); - - check("unsigned short f() { return 0; }\n" - "void foo() { printf(\"%d %ld %f %lf %p\", f(), f(), f(), f(), f()); }"); - ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 1) requires a signed integer given in the argument list.\n" - "[test.cpp:2]: (warning) %ld in format string (no. 2) requires a signed long integer given in the argument list.\n" - "[test.cpp:2]: (warning) %f in format string (no. 3) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 4) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 5) requires an address given in the argument list.\n", errout.str()); - - check("int f() { return 0; }\n" - "void foo() { printf(\"%d %u %lu %f %lf %p\", f(), f(), f(), f(), f(), f()); }"); + "void foo() { printf(\"%d %u %lu %I64u %I64d %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires an unsigned integer given in the argument list.\n" "[test.cpp:2]: (warning) %lu in format string (no. 3) requires an unsigned long integer given in the argument list.\n" - "[test.cpp:2]: (warning) %f in format string (no. 4) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 5) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address given in the argument list.\n", errout.str()); + "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64d in format string (no. 5) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); + + check("unsigned short f() { return 0; }\n" + "void foo() { printf(\"%u %d %ld %I64d %I64u %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); + ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires a signed integer given in the argument list.\n" + "[test.cpp:2]: (warning) %ld in format string (no. 3) requires a signed long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); + + check("int f() { return 0; }\n" + "void foo() { printf(\"%d %u %lu %I64u %I64d %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); + ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires an unsigned integer given in the argument list.\n" + "[test.cpp:2]: (warning) %lu in format string (no. 3) requires an unsigned long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64d in format string (no. 5) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); check("unsigned int f() { return 0; }\n" - "void foo() { printf(\"%u %d %ld %f %lf %p\", f(), f(), f(), f(), f(), f()); }"); + "void foo() { printf(\"%u %d %ld %I64d %I64u %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires a signed integer given in the argument list.\n" "[test.cpp:2]: (warning) %ld in format string (no. 3) requires a signed long integer given in the argument list.\n" - "[test.cpp:2]: (warning) %f in format string (no. 4) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 5) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 6) requires an address given in the argument list.\n", errout.str()); + "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); check("long f() { return 0; }\n" - "void foo() { printf(\"%ld %u %f %lf %p\", f(), f(), f(), f(), f()); }"); + "void foo() { printf(\"%ld %u %lu %I64u %I64d %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires an unsigned integer given in the argument list.\n" - "[test.cpp:2]: (warning) %f in format string (no. 3) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 4) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 5) requires an address given in the argument list.\n", errout.str()); + "[test.cpp:2]: (warning) %lu in format string (no. 3) requires an unsigned long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64d in format string (no. 5) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); check("unsigned long f() { return 0; }\n" - "void foo() { printf(\"%lu %d %f %lf %p\", f(), f(), f(), f(), f()); }"); + "void foo() { printf(\"%lu %d %ld %I64d %I64u %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires a signed integer given in the argument list.\n" - "[test.cpp:2]: (warning) %f in format string (no. 3) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 4) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 5) requires an address given in the argument list.\n", errout.str()); + "[test.cpp:2]: (warning) %ld in format string (no. 3) requires a signed long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 5) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); + + check("long long f() { return 0; }\n" + "void foo() { printf(\"%lld %u %lu %I64u %I64d %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); + ASSERT_EQUALS("[test.cpp:2]: (warning) %u in format string (no. 2) requires an unsigned integer given in the argument list.\n" + "[test.cpp:2]: (warning) %lu in format string (no. 3) requires an unsigned long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 4) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); + + check("unsigned long long f() { return 0; }\n" + "void foo() { printf(\"%llu %d %ld %I64d %I64u %f %lf %p\", f(), f(), f(), f(), f(), f(), f(), f()); }"); + ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires a signed integer given in the argument list.\n" + "[test.cpp:2]: (warning) %ld in format string (no. 3) requires a signed long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64d in format string (no. 4) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 7) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 8) requires an address given in the argument list.\n", errout.str()); check("float f() { return 0; }\n" - "void foo() { printf(\"%f %d %ld %u %lu %lf %p\", f(), f(), f(), f(), f(), f(), f()); }"); + "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }"); ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires a signed integer given in the argument list.\n" "[test.cpp:2]: (warning) %ld in format string (no. 3) requires a signed long integer given in the argument list.\n" "[test.cpp:2]: (warning) %u in format string (no. 4) requires an unsigned integer given in the argument list.\n" "[test.cpp:2]: (warning) %lu in format string (no. 5) requires an unsigned long integer given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 6) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 7) requires an address given in the argument list.\n", errout.str()); + "[test.cpp:2]: (warning) %I64d in format string (no. 6) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 7) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 8) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address given in the argument list.\n", errout.str()); check("double f() { return 0; }\n" - "void foo() { printf(\"%f %d %ld %u %lu %lf %p\", f(), f(), f(), f(), f(), f(), f()); }"); + "void foo() { printf(\"%f %d %ld %u %lu %I64d %I64u %lf %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }"); ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires a signed integer given in the argument list.\n" "[test.cpp:2]: (warning) %ld in format string (no. 3) requires a signed long integer given in the argument list.\n" "[test.cpp:2]: (warning) %u in format string (no. 4) requires an unsigned integer given in the argument list.\n" "[test.cpp:2]: (warning) %lu in format string (no. 5) requires an unsigned long integer given in the argument list.\n" - "[test.cpp:2]: (warning) %lf in format string (no. 6) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 7) requires an address given in the argument list.\n", errout.str()); + "[test.cpp:2]: (warning) %I64d in format string (no. 6) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 7) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %lf in format string (no. 8) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address given in the argument list.\n", errout.str()); check("long double f() { return 0; }\n" - "void foo() { printf(\"%lf %d %ld %u %lu %f %p\", f(), f(), f(), f(), f(), f(), f()); }"); + "void foo() { printf(\"%lf %d %ld %u %lu %I64d %I64u %f %p\", f(), f(), f(), f(), f(), f(), f(), f(), f()); }"); ASSERT_EQUALS("[test.cpp:2]: (warning) %d in format string (no. 2) requires a signed integer given in the argument list.\n" "[test.cpp:2]: (warning) %ld in format string (no. 3) requires a signed long integer given in the argument list.\n" "[test.cpp:2]: (warning) %u in format string (no. 4) requires an unsigned integer given in the argument list.\n" "[test.cpp:2]: (warning) %lu in format string (no. 5) requires an unsigned long integer given in the argument list.\n" - "[test.cpp:2]: (warning) %f in format string (no. 6) requires a floating point number given in the argument list.\n" - "[test.cpp:2]: (warning) %p in format string (no. 7) requires an address given in the argument list.\n", errout.str()); + "[test.cpp:2]: (warning) %I64d in format string (no. 6) requires a signed long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %I64u in format string (no. 7) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:2]: (warning) %f in format string (no. 8) requires a floating point number given in the argument list.\n" + "[test.cpp:2]: (warning) %p in format string (no. 9) requires an address given in the argument list.\n", errout.str()); check("namespace bar { int f() { return 0; } }\n" "void foo() { printf(\"%d %u %lu %f %lf %p\", bar::f(), bar::f(), bar::f(), bar::f(), bar::f(), bar::f()); }"); @@ -1073,8 +1084,8 @@ private: "[test.cpp:9]: (warning) %Iu in format string (no. 2) requires an unsigned integer given in the argument list.\n" "[test.cpp:10]: (warning) %I32u in format string (no. 2) requires an unsigned integer given in the argument list.\n" "[test.cpp:11]: (warning) %I32d in format string (no. 1) requires a signed integer given in the argument list.\n" - "[test.cpp:12]: (warning) %I64u in format string (no. 2) requires an unsigned integer given in the argument list.\n" - "[test.cpp:13]: (warning) %I64d in format string (no. 1) requires a signed integer given in the argument list.\n", errout.str()); + "[test.cpp:12]: (warning) %I64u in format string (no. 2) requires an unsigned long long integer given in the argument list.\n" + "[test.cpp:13]: (warning) %I64d in format string (no. 1) requires a signed long long integer given in the argument list.\n", errout.str()); check("void foo() {\n" " size_t s;\n"