diff options
| author | Max Kellermann <max@musicpd.org> | 2020-04-06 15:04:59 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-04-06 15:06:52 +0200 |
| commit | dd37b4656e5bfa5d1967d4c607732269c77185c9 (patch) | |
| tree | 7b8696cbef978fb15103f3e70fe4611b8d90f5c1 /src/storage | |
| parent | e2d2bb8755a617d3dc0de15d2dc3f33829290428 (diff) | |
storage/{composite,local}: fix -Wnonnull warnings
Diffstat (limited to 'src/storage')
| -rw-r--r-- | src/storage/CompositeStorage.cxx | 2 | ||||
| -rw-r--r-- | src/storage/plugins/LocalStorage.cxx | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/storage/CompositeStorage.cxx b/src/storage/CompositeStorage.cxx index ba6858415..479927f65 100644 --- a/src/storage/CompositeStorage.cxx +++ b/src/storage/CompositeStorage.cxx @@ -332,7 +332,7 @@ CompositeStorage::MapToRelativeUTF8(std::string_view uri) const noexcept } if (!root.MapToRelativeUTF8(relative_buffer, uri)) - return nullptr; + return {}; return relative_buffer; } diff --git a/src/storage/plugins/LocalStorage.cxx b/src/storage/plugins/LocalStorage.cxx index f1882b722..b25a5b035 100644 --- a/src/storage/plugins/LocalStorage.cxx +++ b/src/storage/plugins/LocalStorage.cxx @@ -106,8 +106,6 @@ LocalStorage::MapUTF8(std::string_view uri_utf8) const noexcept AllocatedPath LocalStorage::MapFSOrThrow(std::string_view uri_utf8) const { - assert(uri_utf8 != nullptr); - if (uri_utf8.empty()) return base_fs; |