--check-library: dont write <noreturn> messages now since they cant be fixed.

This commit is contained in:
Daniel Marjamäki 2015-03-05 07:19:03 +01:00
parent cbc8c4f57d
commit e38f15ecc0
1 changed files with 21 additions and 4 deletions

View File

@ -8089,10 +8089,27 @@ bool Tokenizer::IsScopeNoReturn(const Token *endScopeToken, bool *unknown) const
if (unknown) if (unknown)
*unknown = !unknownFunc.empty(); *unknown = !unknownFunc.empty();
if (!unknownFunc.empty() && _settings->checkLibrary && _settings->isEnabled("information")) { if (!unknownFunc.empty() && _settings->checkLibrary && _settings->isEnabled("information")) {
reportError(endScopeToken->previous(), // Is function global?
Severity::information, bool globalFunction = true;
"checkLibraryNoReturn", if (Token::simpleMatch(endScopeToken->tokAt(-2), ") ; }")) {
"--check-library: Function " + unknownFunc + "() should have <noreturn> configuration"); const Token * const ftok = endScopeToken->linkAt(-2)->previous();
if (ftok &&
ftok->isName() &&
ftok->function() &&
ftok->function()->nestedIn &&
ftok->function()->nestedIn->type != Scope::eGlobal) {
globalFunction = false;
}
}
// don't warn for nonglobal functions (class methods, functions hidden in namespaces) since they cant be configured yet
// FIXME: when methods and namespaces can be configured properly, remove the "globalFunction" check
if (globalFunction) {
reportError(endScopeToken->previous(),
Severity::information,
"checkLibraryNoReturn",
"--check-library: Function " + unknownFunc + "() should have <noreturn> configuration");
}
} }
return ret; return ret;
} }