Merge tag 'v0.20.7'
release v0.20.7
This commit is contained in:
@@ -65,13 +65,13 @@ public:
|
||||
|
||||
StorageDirectoryReader *OpenDirectory(const char *uri_utf8) override;
|
||||
|
||||
std::string MapUTF8(const char *uri_utf8) const override;
|
||||
std::string MapUTF8(const char *uri_utf8) const noexcept override;
|
||||
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const override;
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const noexcept override;
|
||||
};
|
||||
|
||||
std::string
|
||||
CurlStorage::MapUTF8(const char *uri_utf8) const
|
||||
CurlStorage::MapUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
@@ -84,7 +84,7 @@ CurlStorage::MapUTF8(const char *uri_utf8) const
|
||||
}
|
||||
|
||||
const char *
|
||||
CurlStorage::MapToRelativeUTF8(const char *uri_utf8) const
|
||||
CurlStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
// TODO: escape/unescape?
|
||||
|
||||
@@ -435,7 +435,7 @@ CurlStorage::GetInfo(const char *uri_utf8, gcc_unused bool follow)
|
||||
|
||||
gcc_pure
|
||||
static const char *
|
||||
UriPathOrSlash(const char *uri)
|
||||
UriPathOrSlash(const char *uri) noexcept
|
||||
{
|
||||
const char *path = uri_get_path(uri);
|
||||
if (path == nullptr)
|
||||
|
||||
@@ -61,17 +61,16 @@ public:
|
||||
|
||||
StorageDirectoryReader *OpenDirectory(const char *uri_utf8) override;
|
||||
|
||||
std::string MapUTF8(const char *uri_utf8) const override;
|
||||
std::string MapUTF8(const char *uri_utf8) const noexcept override;
|
||||
|
||||
AllocatedPath MapFS(const char *uri_utf8) const override;
|
||||
AllocatedPath MapFS(const char *uri_utf8) const noexcept override;
|
||||
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const override;
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const noexcept override;
|
||||
|
||||
private:
|
||||
AllocatedPath MapFSOrThrow(const char *uri_utf8) const;
|
||||
};
|
||||
|
||||
gcc_pure
|
||||
static StorageFileInfo
|
||||
Stat(Path path, bool follow)
|
||||
{
|
||||
@@ -97,7 +96,7 @@ Stat(Path path, bool follow)
|
||||
}
|
||||
|
||||
std::string
|
||||
LocalStorage::MapUTF8(const char *uri_utf8) const
|
||||
LocalStorage::MapUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
@@ -120,7 +119,7 @@ LocalStorage::MapFSOrThrow(const char *uri_utf8) const
|
||||
}
|
||||
|
||||
AllocatedPath
|
||||
LocalStorage::MapFS(const char *uri_utf8) const
|
||||
LocalStorage::MapFS(const char *uri_utf8) const noexcept
|
||||
{
|
||||
try {
|
||||
return MapFSOrThrow(uri_utf8);
|
||||
@@ -130,7 +129,7 @@ LocalStorage::MapFS(const char *uri_utf8) const
|
||||
}
|
||||
|
||||
const char *
|
||||
LocalStorage::MapToRelativeUTF8(const char *uri_utf8) const
|
||||
LocalStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
return PathTraitsUTF8::Relative(base_utf8.c_str(), uri_utf8);
|
||||
}
|
||||
@@ -149,7 +148,7 @@ LocalStorage::OpenDirectory(const char *uri_utf8)
|
||||
|
||||
gcc_pure
|
||||
static bool
|
||||
SkipNameFS(PathTraitsFS::const_pointer_type name_fs)
|
||||
SkipNameFS(PathTraitsFS::const_pointer_type name_fs) noexcept
|
||||
{
|
||||
return name_fs[0] == '.' &&
|
||||
(name_fs[1] == 0 ||
|
||||
|
||||
@@ -87,9 +87,9 @@ public:
|
||||
|
||||
StorageDirectoryReader *OpenDirectory(const char *uri_utf8) override;
|
||||
|
||||
std::string MapUTF8(const char *uri_utf8) const override;
|
||||
std::string MapUTF8(const char *uri_utf8) const noexcept override;
|
||||
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const override;
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const noexcept override;
|
||||
|
||||
/* virtual methods from NfsLease */
|
||||
void OnNfsConnectionReady() final {
|
||||
@@ -223,7 +223,7 @@ UriToNfsPath(const char *_uri_utf8)
|
||||
}
|
||||
|
||||
std::string
|
||||
NfsStorage::MapUTF8(const char *uri_utf8) const
|
||||
NfsStorage::MapUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
@@ -234,7 +234,7 @@ NfsStorage::MapUTF8(const char *uri_utf8) const
|
||||
}
|
||||
|
||||
const char *
|
||||
NfsStorage::MapToRelativeUTF8(const char *uri_utf8) const
|
||||
NfsStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
return PathTraitsUTF8::Relative(base.c_str(), uri_utf8);
|
||||
}
|
||||
@@ -291,7 +291,7 @@ NfsStorage::GetInfo(const char *uri_utf8, gcc_unused bool follow)
|
||||
|
||||
gcc_pure
|
||||
static bool
|
||||
SkipNameFS(const char *name)
|
||||
SkipNameFS(const char *name) noexcept
|
||||
{
|
||||
return name[0] == '.' &&
|
||||
(name[1] == 0 ||
|
||||
|
||||
@@ -69,13 +69,13 @@ public:
|
||||
|
||||
StorageDirectoryReader *OpenDirectory(const char *uri_utf8) override;
|
||||
|
||||
std::string MapUTF8(const char *uri_utf8) const override;
|
||||
std::string MapUTF8(const char *uri_utf8) const noexcept override;
|
||||
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const override;
|
||||
const char *MapToRelativeUTF8(const char *uri_utf8) const noexcept override;
|
||||
};
|
||||
|
||||
std::string
|
||||
SmbclientStorage::MapUTF8(const char *uri_utf8) const
|
||||
SmbclientStorage::MapUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
assert(uri_utf8 != nullptr);
|
||||
|
||||
@@ -86,7 +86,7 @@ SmbclientStorage::MapUTF8(const char *uri_utf8) const
|
||||
}
|
||||
|
||||
const char *
|
||||
SmbclientStorage::MapToRelativeUTF8(const char *uri_utf8) const
|
||||
SmbclientStorage::MapToRelativeUTF8(const char *uri_utf8) const noexcept
|
||||
{
|
||||
return PathTraitsUTF8::Relative(base.c_str(), uri_utf8);
|
||||
}
|
||||
@@ -143,7 +143,7 @@ SmbclientStorage::OpenDirectory(const char *uri_utf8)
|
||||
|
||||
gcc_pure
|
||||
static bool
|
||||
SkipNameFS(const char *name)
|
||||
SkipNameFS(const char *name) noexcept
|
||||
{
|
||||
return name[0] == '.' &&
|
||||
(name[1] == 0 ||
|
||||
|
||||
Reference in New Issue
Block a user