From 06862272b0bcbe079260311fa234a07d4b41fc66 Mon Sep 17 00:00:00 2001 From: orbitcowboy Date: Fri, 5 Jul 2024 17:22:53 +0200 Subject: [PATCH 1/2] Removed condtion that is always true --- cli/cmdlineparser.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index 5da5b898e4c..c59cad09aa5 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -72,16 +72,15 @@ static bool addFilesToList(const std::string& fileList, std::vector return false; files = &infile; } - if (files && *files) { - std::string fileName; + std::string fileName; + // cppcheck-suppress accessMoved - FP + while (std::getline(*files, fileName)) { // next line // cppcheck-suppress accessMoved - FP - while (std::getline(*files, fileName)) { // next line - // cppcheck-suppress accessMoved - FP - if (!fileName.empty()) { - pathNames.emplace_back(std::move(fileName)); - } + if (!fileName.empty()) { + pathNames.emplace_back(std::move(fileName)); } } + return true; } From 5d2c7c10fb590819d09464a8b6a4f5c7070b2a42 Mon Sep 17 00:00:00 2001 From: orbitcowboy Date: Fri, 5 Jul 2024 17:25:25 +0200 Subject: [PATCH 2/2] Format --- cli/cmdlineparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index c59cad09aa5..0c44f2f3821 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -80,7 +80,7 @@ static bool addFilesToList(const std::string& fileList, std::vector pathNames.emplace_back(std::move(fileName)); } } - + return true; }