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

db/simple/Directory: pass std::string_view to several methods

Browse Source
This commit is contained in:
Max Kellermann
2020-04-02 19:23:04 +02:00
parent 386235e2d2
commit 6593b5998a
9 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/db/plugins/simple/Directory.cxx
View File

@@ -83,11 +83,10 @@ Directory::GetName() const noexcept
}
Directory *
Directory::CreateChild(const char *name_utf8) noexcept
Directory::CreateChild(std::string_view name_utf8) noexcept
{
assert(holding_db_lock());
assert(name_utf8 != nullptr);
assert(*name_utf8 != 0);
assert(!name_utf8.empty());
std::string path_utf8 = IsRoot()
? std::string(name_utf8)
@@ -99,12 +98,12 @@ Directory::CreateChild(const char *name_utf8) noexcept
}
const Directory *
Directory::FindChild(const char *name) const noexcept
Directory::FindChild(std::string_view name) const noexcept
{
assert(holding_db_lock());
for (const auto &child : children)
if (strcmp(child.GetName(), name) == 0)
if (name.compare(child.GetName()) == 0)
return &child;
return nullptr;
@@ -194,10 +193,9 @@ Directory::RemoveSong(Song *song) noexcept
}
const Song *
Directory::FindSong(const char *name_utf8) const noexcept
Directory::FindSong(std::string_view name_utf8) const noexcept
{
assert(holding_db_lock());
assert(name_utf8 != nullptr);
for (auto &song : songs) {
assert(&song.parent == this);

13
src/db/plugins/simple/Directory.hxx
View File

@@ -30,6 +30,7 @@
#include <boost/intrusive/list.hpp>
#include <string>
#include <string_view>
/**
* Virtual directory that is really an archive file or a folder inside
@@ -146,16 +147,16 @@ public:
*
* @param name_utf8 the UTF-8 encoded name of the new sub directory
*/
Directory *CreateChild(const char *name_utf8) noexcept;
Directory *CreateChild(std::string_view name_utf8) noexcept;
/**
* Caller must lock the #db_mutex.
*/
gcc_pure
const Directory *FindChild(const char *name) const noexcept;
const Directory *FindChild(std::string_view name) const noexcept;
gcc_pure
Directory *FindChild(const char *name) noexcept {
Directory *FindChild(std::string_view name) noexcept {
const Directory *cthis = this;
return const_cast<Directory *>(cthis->FindChild(name));
}
@@ -166,7 +167,7 @@ public:
*
* Caller must lock the #db_mutex.
*/
Directory *MakeChild(const char *name_utf8) noexcept {
Directory *MakeChild(std::string_view name_utf8) noexcept {
Directory *child = FindChild(name_utf8);
if (child == nullptr)
child = CreateChild(name_utf8);
@@ -247,10 +248,10 @@ public:
* Caller must lock the #db_mutex.
*/
gcc_pure
const Song *FindSong(const char *name_utf8) const noexcept;
const Song *FindSong(std::string_view name_utf8) const noexcept;
gcc_pure
Song *FindSong(const char *name_utf8) noexcept {
Song *FindSong(std::string_view name_utf8) noexcept {
const Directory *cthis = this;
return const_cast<Song *>(cthis->FindSong(name_utf8));
}