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

Main: allocate Instance on the stack

Browse Source
This commit is contained in:
Max Kellermann
2019-05-29 21:22:25 +02:00
parent 620a39afb4
commit 71a5c8b819
5 changed files with 89 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mapper.cxx
View File

@@ -66,10 +66,10 @@ map_uri_fs(const char *uri) noexcept
assert(uri != nullptr);
assert(*uri != '/');
if (instance->storage == nullptr)
if (global_instance->storage == nullptr)
return nullptr;
const auto music_dir_fs = instance->storage->MapFS("");
const auto music_dir_fs = global_instance->storage->MapFS("");
if (music_dir_fs.IsNull())
return nullptr;
@@ -84,10 +84,10 @@ std::string
map_fs_to_utf8(Path path_fs) noexcept
{
if (path_fs.IsAbsolute()) {
if (instance->storage == nullptr)
if (global_instance->storage == nullptr)
return std::string();
const auto music_dir_fs = instance->storage->MapFS("");
const auto music_dir_fs = global_instance->storage->MapFS("");
if (music_dir_fs.IsNull())
return std::string();