Skip to content

utils.cpp: simplified splitString() #7215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 2 commits into from
Jan 14, 2025
Merged

utils.cpp: simplified splitString() #7215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a7cdb1
utils.cpp: simplified `splitString()`
firewave Jul 13, 2024
2f71aa4
changed `splitString()` result to `std::vector` to allow usage of `op…
firewave Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/cmdlineparser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down
22 changes: 10 additions & 12 deletions lib/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
3 changes: 1 addition & 2 deletions lib/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
#include <functional>
#include <initializer_list>
#include <limits>
#include <list>
#include <stdexcept>
#include <string>
#include <type_traits>
Expand Down Expand Up @@ -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>
Expand Down