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

storage/{composite,local}: fix -Wnonnull warnings

Browse Source
This commit is contained in:
Max Kellermann 2020-04-06 15:04:59 +02:00
parent e2d2bb8755
commit dd37b4656e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/CompositeStorage.cxx
View File

@ -332,7 +332,7 @@ CompositeStorage::MapToRelativeUTF8(std::string_view uri) const noexcept
} }
if (!root.MapToRelativeUTF8(relative_buffer, uri)) if (!root.MapToRelativeUTF8(relative_buffer, uri))
return nullptr; return {};
return relative_buffer; return relative_buffer;
} }

2
src/storage/plugins/LocalStorage.cxx
View File

@ -106,8 +106,6 @@ LocalStorage::MapUTF8(std::string_view uri_utf8) const noexcept
AllocatedPath AllocatedPath
LocalStorage::MapFSOrThrow(std::string_view uri_utf8) const LocalStorage::MapFSOrThrow(std::string_view uri_utf8) const
{ {
assert(uri_utf8 != nullptr);
if (uri_utf8.empty()) if (uri_utf8.empty())
return base_fs; return base_fs;