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

Library: Replace auto with real types (#4207) 

Following up on fc6c203b0e, replace auto with the correct types to
clairfy the code. Note the use of const on the first type in the pair,
which allows us to use a reference.
This commit is contained in:
Rikard Falkeborn 2022-06-11 23:21:25 +02:00 committed by GitHub
parent ecb24e28bc
commit 187460a277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/library.cpp
View File

@ -1131,7 +1131,7 @@ bool Library::isScopeNoReturn(const Token *end, std::string *unknownFunc) const
const Library::Container* Library::detectContainer(const Token* typeStart, bool iterator) const const Library::Container* Library::detectContainer(const Token* typeStart, bool iterator) const
{ {
for (const auto &c : containers) { for (const std::pair<const std::string, Library::Container> & c : containers) {
const Container& container = c.second; const Container& container = c.second;
if (container.startPattern.empty()) if (container.startPattern.empty())
continue; continue;
@ -1208,7 +1208,7 @@ bool Library::matchArguments(const Token *ftok, const std::string &functionName)
return (callargs == 0); return (callargs == 0);
int args = 0; int args = 0;
int firstOptionalArg = -1; int firstOptionalArg = -1;
for (const auto & argCheck : it->second.argumentChecks) { for (const std::pair<const int, Library::ArgumentChecks> & argCheck : it->second.argumentChecks) {
if (argCheck.first > args) if (argCheck.first > args)
args = argCheck.first; args = argCheck.first;
if (argCheck.second.optional && (firstOptionalArg == -1 || firstOptionalArg > argCheck.first)) if (argCheck.second.optional && (firstOptionalArg == -1 || firstOptionalArg > argCheck.first))
@ -1287,7 +1287,7 @@ bool Library::formatstr_function(const Token* ftok) const
int Library::formatstr_argno(const Token* ftok) const int Library::formatstr_argno(const Token* ftok) const
{ {
const std::map<int, Library::ArgumentChecks>& argumentChecksFunc = functions.at(getFunctionName(ftok)).argumentChecks; const std::map<int, Library::ArgumentChecks>& argumentChecksFunc = functions.at(getFunctionName(ftok)).argumentChecks;
for (const auto & argCheckFunc : argumentChecksFunc) { for (const std::pair<const int, Library::ArgumentChecks> & argCheckFunc : argumentChecksFunc) {
if (argCheckFunc.second.formatstr) { if (argCheckFunc.second.formatstr) {
return argCheckFunc.first - 1; return argCheckFunc.first - 1;
} }
@ -1373,7 +1373,7 @@ bool Library::hasminsize(const Token *ftok) const
const std::unordered_map<std::string, Function>::const_iterator it1 = functions.find(getFunctionName(ftok)); const std::unordered_map<std::string, Function>::const_iterator it1 = functions.find(getFunctionName(ftok));
if (it1 == functions.cend()) if (it1 == functions.cend())
return false; return false;
for (const auto & argCheck : it1->second.argumentChecks) { for (const std::pair<const int, Library::ArgumentChecks> & argCheck : it1->second.argumentChecks) {
if (!argCheck.second.minsizes.empty()) if (!argCheck.second.minsizes.empty())
return true; return true;
} }