Skip to content

Commit 6fa028a

Browse files
author
Your Name
committed
Fix cppcheck warnings
1 parent 3cea3ef commit 6fa028a

7 files changed

Lines changed: 6 additions & 16 deletions

File tree

lib/astutils.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,6 @@ bool isTemporary(const Token* tok, const Library* library, bool unknown)
495495
}
496496
return unknown;
497497
}
498-
if (tok->isCast())
499-
return false;
500498
// Currying a function is unknown in cppcheck
501499
if (Token::simpleMatch(tok, "(") && Token::simpleMatch(tok->astOperand1(), "("))
502500
return unknown;
@@ -1543,8 +1541,6 @@ bool isUsedAsBool(const Token* const tok, const Settings& settings)
15431541
return true;
15441542
if (parent->isCast())
15451543
return !Token::simpleMatch(parent->astOperand1(), "dynamic_cast") && isUsedAsBool(parent, settings);
1546-
if (parent->isUnaryOp("*"))
1547-
return isUsedAsBool(parent, settings);
15481544
if (Token::Match(parent, "==|!=") && tok->valueType() && tok->valueType()->pointer &&
15491545
tok->astSibling()->hasKnownIntValue() && tok->astSibling()->getKnownIntValue() == 0)
15501546
return true;

lib/checkclass.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3452,8 +3452,7 @@ void CheckClassImpl::checkUselessOverride()
34523452

34533453
if (isSameCode) {
34543454
// bailout for shadowed members
3455-
if (!classScope->definedType ||
3456-
!getDuplInheritedMembersRecursive(classScope->definedType, classScope->definedType, /*skipPrivate*/ false).empty() ||
3455+
if (!getDuplInheritedMembersRecursive(classScope->definedType, classScope->definedType, /*skipPrivate*/ false).empty() ||
34573456
!getDuplInheritedMemberFunctionsRecursive(classScope->definedType, classScope->definedType, /*skipPrivate*/ false).empty())
34583457
continue;
34593458
uselessOverrideError(baseFunc, &func, true);

lib/checkcondition.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ bool CheckConditionImpl::isOverlappingCond(const Token * const cond1, const Toke
455455
if (!num1->isNumber() || MathLib::isNegative(num1->str()))
456456
return false;
457457

458-
if (!Token::Match(cond2, "&|==") || !cond2->astOperand1() || !cond2->astOperand2())
458+
if (!Token::Match(cond2, "&|==") || !cond2->astOperand1())
459459
return false;
460460
const Token *expr2 = cond2->astOperand1();
461461
const Token *num2 = cond2->astOperand2();

lib/checkstl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ void CheckStlImpl::iterators()
549549
}
550550

551551
// Not different containers if a reference is used..
552-
if (containerToken && containerToken->variable() && containerToken->variable()->isReference()) {
552+
if (containerToken->variable() && containerToken->variable()->isReference()) {
553553
const Token *nameToken = containerToken->variable()->nameToken();
554554
if (Token::Match(nameToken, "%name% =")) {
555555
const Token *name1 = nameToken->tokAt(2);

lib/reverseanalyzer.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,6 @@ namespace {
340340
valueFlowGenericForward(condTok, analyzer, tokenlist, errorLogger, settings);
341341
else if (condAction.isRead())
342342
break;
343-
// If the condition modifies the variable then bail
344-
if (condAction.isModified())
345-
break;
346343
tok = jumpToStart(tok->link());
347344
continue;
348345
}

lib/symboldatabase.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,10 +1043,8 @@ void SymbolDatabase::createSymbolDatabaseNeedInitialization()
10431043
scope.definedType->needInitialization = Type::NeedInitialization::True;
10441044
else if (!unknown)
10451045
scope.definedType->needInitialization = Type::NeedInitialization::False;
1046-
else {
1047-
if (scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
1048-
unknowns++;
1049-
}
1046+
else
1047+
unknowns++;
10501048
}
10511049
} else if (scope.type == ScopeType::eUnion && scope.definedType->needInitialization == Type::NeedInitialization::Unknown)
10521050
scope.definedType->needInitialization = Type::NeedInitialization::True;

lib/tokenize.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2711,7 +2711,7 @@ namespace {
27112711
{
27122712
Token *tok1 = tok;
27132713

2714-
if (tok1 && tok1->str() != nameToken->str())
2714+
if (!tok1 || tok1->str() != nameToken->str())
27152715
return false;
27162716

27172717
// skip this using

0 commit comments

Comments
 (0)