From f5033866666c7503f0d170439d1f6df4b733923d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 28 Apr 2019 10:07:11 +0200 Subject: [PATCH] Refactoring; replace for loop with std::find_if --- lib/checkbufferoverrun.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp index 110da66dd..2701b85a2 100644 --- a/lib/checkbufferoverrun.cpp +++ b/lib/checkbufferoverrun.cpp @@ -63,11 +63,9 @@ static const CWE CWE_BUFFER_OVERRUN(788U); // Access of Memory Location After static const ValueFlow::Value *getBufferSizeValue(const Token *tok) { - for (const ValueFlow::Value &value : tok->values()) { - if (value.isBufferSizeValue()) - return &value; - } - return nullptr; + const std::list &tokenValues = tok->values(); + const auto it = std::find_if(tokenValues.begin(), tokenValues.end(), std::mem_fn(&ValueFlow::Value::isBufferSizeValue)); + return it == tokenValues.end() ? nullptr : &*it; } static size_t getMinFormatStringOutputLength(const std::vector ¶meters, unsigned int formatStringArgNr)