utils.cpp: simplified splitString() (#7215)

danmar · Jan 14, 2025 · 599f505 · 599f505
1 parent a615a28
commit 599f505
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -949,7 +949,7 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
             // --library
             else if (std::strncmp(argv[i], "--library=", 10) == 0) {
-                std::list<std::string> libs = splitString(argv[i] + 10, ',');
+                std::vector<std::string> libs = splitString(argv[i] + 10, ',');
                 for (auto& l : libs) {
                     if (l.empty()) {
                         mLogger.printError("empty library specified.");

diff --git a/lib/utils.cpp b/lib/utils.cpp
@@ -186,20 +186,18 @@ std::string replaceEscapeSequences(const std::string &source) {
 }
 
 
-std::list<std::string> splitString(const std::string& str, char sep)
+std::vector<std::string> splitString(const std::string& str, char sep)
 {
-    if (std::strchr(str.c_str(), sep) == nullptr)
-        return {str};
-
-    std::list<std::string> l;
-    std::string p(str);
-    for (;;) {
-        const std::string::size_type pos = p.find(sep);
-        if (pos == std::string::npos)
+    std::vector<std::string> l;
+
+    std::string::size_type pos1 = 0;
+    std::string::size_type pos2;
+    while (true) {
+        pos2 = str.find(sep, pos1);
+        l.push_back(str.substr(pos1, pos2 - pos1));
+        if (pos2 == std::string::npos)
             break;
-        l.push_back(p.substr(0,pos));
-        p = p.substr(pos+1);
+        pos1 = pos2 + 1;
     }
-    l.push_back(std::move(p));
     return l;
 }
diff --git a/lib/utils.h b/lib/utils.h
@@ -30,7 +30,6 @@
 #include <functional>
 #include <initializer_list>
 #include <limits>
-#include <list>
 #include <stdexcept>
 #include <string>
 #include <type_traits>
@@ -403,7 +402,7 @@ static inline T* empty_if_null(T* p)
  * @param sep The seperator
  * @return The list of seperate strings (including empty ones). The whole input string if no seperator found.
  */
-CPPCHECKLIB std::list<std::string> splitString(const std::string& str, char sep);
+CPPCHECKLIB std::vector<std::string> splitString(const std::string& str, char sep);
 
 namespace utils {
     template<class T>