oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/SplitString: convert return value to std::string_view

Browse Source 
Eliminates lots of overhead.
This commit is contained in:
Max Kellermann
2020-04-03 16:42:49 +02:00
parent 2c02a04566
commit db93bb996c
8 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/SplitString.cxx
View File

@@ -31,28 +31,24 @@
#include "IterableSplitString.hxx"
#include "StringStrip.hxx"
std::forward_list<std::string>
std::forward_list<std::string_view>
SplitString(std::string_view _s, char separator, bool strip) noexcept
{
StringView s(_s);
if (strip)
s.StripLeft();
std::forward_list<std::string> list;
std::forward_list<std::string_view> list;
if (s.empty())
return list;
auto i = list.before_begin();
for (auto value : IterableSplitString(s, separator)) {
const char *begin = value.begin(), *end = value.end();
if (strip)
value.Strip();
if (strip) {
begin = StripLeft(begin, end);
end = StripRight(begin, end);
}
i = list.emplace_after(i, begin, end);
i = list.emplace_after(i, value);
}
return list;

3
src/util/SplitString.hxx
View File

@@ -31,7 +31,6 @@
#define SPLIT_STRING_HXX
#include <forward_list>
#include <string>
#include <string_view>
/**
@@ -44,7 +43,7 @@
* An empty input string, as a special case, results in an empty list
* (and not a list with an empty string).
*/
std::forward_list<std::string>
std::forward_list<std::string_view>
SplitString(std::string_view s, char separator, bool strip=true) noexcept;
#endif