diff options
| author | Max Kellermann <max@musicpd.org> | 2020-04-03 18:58:37 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-04-03 19:29:29 +0200 |
| commit | 2429cc8778d602ed8a93882a81111b5603fd4b17 (patch) | |
| tree | 88817cc2774df50baea061d6413a6355ccd8b71e /src/storage | |
| parent | 3a83a6b5274a7abb12c5d11392d872024a490e37 (diff) | |
fs/Traits: convert first Relative() parameter to std::string_view
Diffstat (limited to 'src/storage')
| -rw-r--r-- | src/storage/plugins/CurlStorage.cxx | 2 | ||||
| -rw-r--r-- | src/storage/plugins/LocalStorage.cxx | 2 | ||||
| -rw-r--r-- | src/storage/plugins/NfsStorage.cxx | 2 | ||||
| -rw-r--r-- | src/storage/plugins/SmbclientStorage.cxx | 2 | ||||
| -rw-r--r-- | src/storage/plugins/UdisksStorage.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/storage/plugins/CurlStorage.cxx b/src/storage/plugins/CurlStorage.cxx index edb3b8f6b..9dca427d2 100644 --- a/src/storage/plugins/CurlStorage.cxx +++ b/src/storage/plugins/CurlStorage.cxx @@ -81,7 +81,7 @@ CurlStorage::MapUTF8(const char *uri_utf8) const noexcept const char * CurlStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept { - return PathTraitsUTF8::Relative(base.c_str(), + return PathTraitsUTF8::Relative(base, CurlUnescape(uri_utf8).c_str()); } diff --git a/src/storage/plugins/LocalStorage.cxx b/src/storage/plugins/LocalStorage.cxx index 336161043..a53e19a39 100644 --- a/src/storage/plugins/LocalStorage.cxx +++ b/src/storage/plugins/LocalStorage.cxx @@ -129,7 +129,7 @@ LocalStorage::MapFS(const char *uri_utf8) const noexcept const char * LocalStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept { - return PathTraitsUTF8::Relative(base_utf8.c_str(), uri_utf8); + return PathTraitsUTF8::Relative(base_utf8, uri_utf8); } StorageFileInfo diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx index a116d5591..0d73c0235 100644 --- a/src/storage/plugins/NfsStorage.cxx +++ b/src/storage/plugins/NfsStorage.cxx @@ -246,7 +246,7 @@ NfsStorage::MapUTF8(const char *uri_utf8) const noexcept const char * NfsStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept { - return PathTraitsUTF8::Relative(base.c_str(), uri_utf8); + return PathTraitsUTF8::Relative(base, uri_utf8); } static void diff --git a/src/storage/plugins/SmbclientStorage.cxx b/src/storage/plugins/SmbclientStorage.cxx index ad08c9eb3..6302555e1 100644 --- a/src/storage/plugins/SmbclientStorage.cxx +++ b/src/storage/plugins/SmbclientStorage.cxx @@ -87,7 +87,7 @@ SmbclientStorage::MapUTF8(const char *uri_utf8) const noexcept const char * SmbclientStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept { - return PathTraitsUTF8::Relative(base.c_str(), uri_utf8); + return PathTraitsUTF8::Relative(base, uri_utf8); } static StorageFileInfo diff --git a/src/storage/plugins/UdisksStorage.cxx b/src/storage/plugins/UdisksStorage.cxx index 2c280e0af..c888662bb 100644 --- a/src/storage/plugins/UdisksStorage.cxx +++ b/src/storage/plugins/UdisksStorage.cxx @@ -347,7 +347,7 @@ UdisksStorage::MapUTF8(const char *uri_utf8) const noexcept const char * UdisksStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept { - return PathTraitsUTF8::Relative(base_uri.c_str(), uri_utf8); + return PathTraitsUTF8::Relative(base_uri, uri_utf8); } static std::unique_ptr<Storage> |