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

storage/Composite: NextSegment() returns std::string_view

Browse Source
This commit is contained in:
Max Kellermann 2020-04-03 19:25:46 +02:00
parent bcf4645263
commit 3a83a6b527
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/storage/CompositeStorage.cxx
View File

@ -82,17 +82,17 @@ CompositeDirectoryReader::GetInfo(bool follow)
return StorageFileInfo(StorageFileInfo::Type::DIRECTORY); return StorageFileInfo(StorageFileInfo::Type::DIRECTORY);
} }
static std::string static std::string_view
NextSegment(const char *&uri_r) NextSegment(const char *&uri_r)
{ {
const char *uri = uri_r; const char *uri = uri_r;
const char *slash = strchr(uri, '/'); const char *slash = strchr(uri, '/');
if (slash == nullptr) { if (slash == nullptr) {
uri_r += strlen(uri); uri_r += strlen(uri);
return std::string(uri); return uri;
} else { } else {
uri_r = slash + 1; uri_r = slash + 1;
return std::string(uri, slash); return std::string_view(uri, slash - uri);
} }
} }
@ -101,7 +101,7 @@ CompositeStorage::Directory::Find(const char *uri) const noexcept
{ {
const Directory *directory = this; const Directory *directory = this;
while (*uri != 0) { while (*uri != 0) {
const std::string name = NextSegment(uri); const auto name = NextSegment(uri);
auto i = directory->children.find(name); auto i = directory->children.find(name);
if (i == directory->children.end()) if (i == directory->children.end())
return nullptr; return nullptr;
@ -142,7 +142,7 @@ CompositeStorage::Directory::Unmount(const char *uri) noexcept
if (StringIsEmpty(uri)) if (StringIsEmpty(uri))
return Unmount(); return Unmount();
const std::string name = NextSegment(uri); const auto name = NextSegment(uri);
auto i = children.find(name); auto i = children.find(name);
if (i == children.end() || !i->second.Unmount(uri)) if (i == children.end() || !i->second.Unmount(uri))
@ -227,7 +227,7 @@ CompositeStorage::FindStorage(const char *uri) const noexcept
const Directory *directory = &root; const Directory *directory = &root;
while (*uri != 0) { while (*uri != 0) {
const std::string name = NextSegment(uri); const auto name = NextSegment(uri);
auto i = directory->children.find(name); auto i = directory->children.find(name);
if (i == directory->children.end()) if (i == directory->children.end())

2
src/storage/CompositeStorage.hxx
View File

@ -49,7 +49,7 @@ class CompositeStorage final : public Storage {
*/ */
std::unique_ptr<Storage> storage; std::unique_ptr<Storage> storage;
std::map<std::string, Directory> children; std::map<std::string, Directory, std::less<>> children;
gcc_pure gcc_pure
bool IsEmpty() const noexcept { bool IsEmpty() const noexcept {