From 484b68c550afa8dede7d9939bfe33e31deee8531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 28 Nov 2020 05:52:35 +0100 Subject: [PATCH] astyle formatting --- lib/checkunusedvar.cpp | 16 ++++++++-------- lib/checkunusedvar.h | 2 +- test/testunusedvar.cpp | 5 ++--- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp index ceb9f8be2..e20b87d2c 100644 --- a/lib/checkunusedvar.cpp +++ b/lib/checkunusedvar.cpp @@ -1517,8 +1517,8 @@ bool CheckUnusedVar::isRecordTypeWithoutSideEffects(const Type* type) return withoutSideEffects = false; } const Function* initValueFunc = valueToken->function(); - if (initValueFunc && !isFunctionWithoutSideEffects(*initValueFunc, valueToken, - std::list{})) { + if (initValueFunc && !isFunctionWithoutSideEffects(*initValueFunc, valueToken, + std::list {})) { return withoutSideEffects = false; } } @@ -1594,7 +1594,8 @@ bool CheckUnusedVar::isEmptyType(const Type* type) } bool CheckUnusedVar::isFunctionWithoutSideEffects(const Function& func, const Token* functionUsageToken, - std::list checkedFuncs) { + std::list checkedFuncs) +{ // no body to analyze if (!func.hasBody()) { return false; @@ -1608,9 +1609,8 @@ bool CheckUnusedVar::isFunctionWithoutSideEffects(const Function& func, const To } bool sideEffectReturnFound = false; - for (Token* bodyToken = func.functionScope->bodyStart->next(); bodyToken != func.functionScope->bodyEnd; - bodyToken = bodyToken->next()) - { + for (Token* bodyToken = func.functionScope->bodyStart->next(); bodyToken != func.functionScope->bodyEnd; + bodyToken = bodyToken->next()) { const Variable* bodyVariable = bodyToken->variable(); if (bodyVariable) { // check variable for side-effects @@ -1618,7 +1618,7 @@ bool CheckUnusedVar::isFunctionWithoutSideEffects(const Function& func, const To return false; } // check if global variable is changed - if (bodyVariable->isGlobal()) { + if (bodyVariable->isGlobal()) { return false; // TODO: analyze global variable usage } } @@ -1645,7 +1645,7 @@ bool CheckUnusedVar::isFunctionWithoutSideEffects(const Function& func, const To } // simple one-token return const Variable* returnVariable = returnValueToken->variable(); - if (returnValueToken->isLiteral() || + if (returnValueToken->isLiteral() || (returnVariable && isVariableWithoutSideEffects(*returnVariable))) { continue; } diff --git a/lib/checkunusedvar.h b/lib/checkunusedvar.h index 9bbe3770b..e44efef78 100644 --- a/lib/checkunusedvar.h +++ b/lib/checkunusedvar.h @@ -75,7 +75,7 @@ private: bool isVariableWithoutSideEffects(const Variable& var); bool isEmptyType(const Type* type); bool isFunctionWithoutSideEffects(const Function& func, const Token* functionUsageToken, - std::list checkedFuncs); + std::list checkedFuncs); // Error messages.. void unusedStructMemberError(const Token *tok, const std::string &structname, const std::string &varname, bool isUnion = false); diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp index 8b6f518f6..af2eb6782 100644 --- a/test/testunusedvar.cpp +++ b/test/testunusedvar.cpp @@ -515,8 +515,7 @@ private: ASSERT_EQUALS("", errout.str()); } - void cleanFunction() - { + void cleanFunction() { // unknown function functionVariableUsage( "class F {\n" @@ -541,7 +540,7 @@ private: " C c;\n" "}"); ASSERT_EQUALS("", errout.str()); - + // return literal functionVariableUsage( "int func() { return 1; }\n"