From 6736ac7e3a9345121d4842f795f5a475a080d552 Mon Sep 17 00:00:00 2001 From: Paul Fultz II Date: Tue, 3 Aug 2021 10:53:30 -0500 Subject: [PATCH] Revert "Formatted the code [ci skip]" (#3380) This reverts commit 7a6d7f7c2de9846bd12a4bc5aab6c3bb2aba61ec. --- lib/valueflow.cpp | 19 ++++++++++--------- test/testbufferoverrun.cpp | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp index e8cc4d82f..20521adab 100644 --- a/lib/valueflow.cpp +++ b/lib/valueflow.cpp @@ -2605,13 +2605,13 @@ static Analyzer::Result valueFlowForward(Token* top, const std::list& values, TokenList* const tokenlist, const Settings* settings) -// *INDENT-ON* { -Analyzer::Result result{}; -for (const ValueFlow::Value& v : values) +// *INDENT-ON* { - result.update(valueFlowGenericForward(top, makeAnalyzer(exprTok, v, tokenlist), settings)); -} -return result; + Analyzer::Result result{}; + for (const ValueFlow::Value& v : values) { + result.update(valueFlowGenericForward(top, makeAnalyzer(exprTok, v, tokenlist), settings)); + } + return result; } static void valueFlowReverse(Token* tok, @@ -6246,9 +6246,10 @@ static Analyzer::Result valueFlowContainerForwardRecursive(Token* top, const Token* exprTok, const ValueFlow::Value& value, TokenList* tokenlist) -// *INDENT-ON* { -ContainerExpressionAnalyzer a(exprTok, value, tokenlist); -return valueFlowGenericForward(top, a, tokenlist->getSettings()); +// *INDENT-ON* +{ + ContainerExpressionAnalyzer a(exprTok, value, tokenlist); + return valueFlowGenericForward(top, a, tokenlist->getSettings()); } static Analyzer::Result valueFlowContainerForward(Token* startToken, diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp index 974547bd5..44ad035c7 100644 --- a/test/testbufferoverrun.cpp +++ b/test/testbufferoverrun.cpp @@ -4322,7 +4322,7 @@ private: " }\n" " return name;\n" "}\n"); - ASSERT_EQUALS("", errout.str()); + ASSERT_EQUALS("", errout.str()); } void bufferNotZeroTerminated() {