From 2d06a8e8804b1db64c7564532362eecdf7ad81d3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 28 Feb 2015 20:50:15 +0100 Subject: storage/FileInfo: rename to StorageFileInfo --- src/storage/plugins/LocalStorage.cxx | 17 +++++++++-------- src/storage/plugins/NfsStorage.cxx | 24 ++++++++++++------------ src/storage/plugins/SmbclientStorage.cxx | 18 ++++++++++-------- 3 files changed, 31 insertions(+), 28 deletions(-) (limited to 'src/storage/plugins') diff --git a/src/storage/plugins/LocalStorage.cxx b/src/storage/plugins/LocalStorage.cxx index a8e33c788..484c9c6db 100644 --- a/src/storage/plugins/LocalStorage.cxx +++ b/src/storage/plugins/LocalStorage.cxx @@ -46,7 +46,8 @@ public: /* virtual methods from class StorageDirectoryReader */ const char *Read() override; - bool GetInfo(bool follow, FileInfo &info, Error &error) override; + bool GetInfo(bool follow, StorageFileInfo &info, + Error &error) override; }; class LocalStorage final : public Storage { @@ -61,7 +62,7 @@ public: } /* virtual methods from class Storage */ - bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, + bool GetInfo(const char *uri_utf8, bool follow, StorageFileInfo &info, Error &error) override; StorageDirectoryReader *OpenDirectory(const char *uri_utf8, @@ -78,7 +79,7 @@ private: }; static bool -Stat(Path path, bool follow, FileInfo &info, Error &error) +Stat(Path path, bool follow, StorageFileInfo &info, Error &error) { struct stat st; if (!StatFile(path, st, follow)) { @@ -90,11 +91,11 @@ Stat(Path path, bool follow, FileInfo &info, Error &error) } if (S_ISREG(st.st_mode)) - info.type = FileInfo::Type::REGULAR; + info.type = StorageFileInfo::Type::REGULAR; else if (S_ISDIR(st.st_mode)) - info.type = FileInfo::Type::DIRECTORY; + info.type = StorageFileInfo::Type::DIRECTORY; else - info.type = FileInfo::Type::OTHER; + info.type = StorageFileInfo::Type::OTHER; info.size = st.st_size; info.mtime = st.st_mtime; @@ -142,7 +143,7 @@ LocalStorage::MapToRelativeUTF8(const char *uri_utf8) const } bool -LocalStorage::GetInfo(const char *uri_utf8, bool follow, FileInfo &info, +LocalStorage::GetInfo(const char *uri_utf8, bool follow, StorageFileInfo &info, Error &error) { AllocatedPath path_fs = MapFS(uri_utf8, error); @@ -198,7 +199,7 @@ LocalDirectoryReader::Read() } bool -LocalDirectoryReader::GetInfo(bool follow, FileInfo &info, Error &error) +LocalDirectoryReader::GetInfo(bool follow, StorageFileInfo &info, Error &error) { const AllocatedPath path_fs = AllocatedPath::Build(base_fs, reader.GetEntry()); diff --git a/src/storage/plugins/NfsStorage.cxx b/src/storage/plugins/NfsStorage.cxx index dc9826214..6a3eeedaf 100644 --- a/src/storage/plugins/NfsStorage.cxx +++ b/src/storage/plugins/NfsStorage.cxx @@ -84,7 +84,7 @@ public: } /* virtual methods from class Storage */ - bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, + bool GetInfo(const char *uri_utf8, bool follow, StorageFileInfo &info, Error &error) override; StorageDirectoryReader *OpenDirectory(const char *uri_utf8, @@ -245,14 +245,14 @@ NfsStorage::MapToRelativeUTF8(const char *uri_utf8) const } static void -Copy(FileInfo &info, const struct stat &st) +Copy(StorageFileInfo &info, const struct stat &st) { if (S_ISREG(st.st_mode)) - info.type = FileInfo::Type::REGULAR; + info.type = StorageFileInfo::Type::REGULAR; else if (S_ISDIR(st.st_mode)) - info.type = FileInfo::Type::DIRECTORY; + info.type = StorageFileInfo::Type::DIRECTORY; else - info.type = FileInfo::Type::OTHER; + info.type = StorageFileInfo::Type::OTHER; info.size = st.st_size; info.mtime = st.st_mtime; @@ -262,11 +262,11 @@ Copy(FileInfo &info, const struct stat &st) class NfsGetInfoOperation final : public BlockingNfsOperation { const char *const path; - FileInfo &info; + StorageFileInfo &info; public: NfsGetInfoOperation(NfsConnection &_connection, const char *_path, - FileInfo &_info) + StorageFileInfo &_info) :BlockingNfsOperation(_connection), path(_path), info(_info) {} protected: @@ -281,7 +281,7 @@ protected: bool NfsStorage::GetInfo(const char *uri_utf8, gcc_unused bool follow, - FileInfo &info, Error &error) + StorageFileInfo &info, Error &error) { const std::string path = UriToNfsPath(uri_utf8, error); if (path.empty()) @@ -304,19 +304,19 @@ SkipNameFS(const char *name) } static void -Copy(FileInfo &info, const struct nfsdirent &ent) +Copy(StorageFileInfo &info, const struct nfsdirent &ent) { switch (ent.type) { case NF3REG: - info.type = FileInfo::Type::REGULAR; + info.type = StorageFileInfo::Type::REGULAR; break; case NF3DIR: - info.type = FileInfo::Type::DIRECTORY; + info.type = StorageFileInfo::Type::DIRECTORY; break; default: - info.type = FileInfo::Type::OTHER; + info.type = StorageFileInfo::Type::OTHER; break; } diff --git a/src/storage/plugins/SmbclientStorage.cxx b/src/storage/plugins/SmbclientStorage.cxx index 49c9952f2..84b212cd1 100644 --- a/src/storage/plugins/SmbclientStorage.cxx +++ b/src/storage/plugins/SmbclientStorage.cxx @@ -44,7 +44,8 @@ public: /* virtual methods from class StorageDirectoryReader */ const char *Read() override; - bool GetInfo(bool follow, FileInfo &info, Error &error) override; + bool GetInfo(bool follow, StorageFileInfo &info, + Error &error) override; }; class SmbclientStorage final : public Storage { @@ -63,7 +64,7 @@ public: } /* virtual methods from class Storage */ - bool GetInfo(const char *uri_utf8, bool follow, FileInfo &info, + bool GetInfo(const char *uri_utf8, bool follow, StorageFileInfo &info, Error &error) override; StorageDirectoryReader *OpenDirectory(const char *uri_utf8, @@ -92,7 +93,7 @@ SmbclientStorage::MapToRelativeUTF8(const char *uri_utf8) const } static bool -GetInfo(const char *path, FileInfo &info, Error &error) +GetInfo(const char *path, StorageFileInfo &info, Error &error) { struct stat st; smbclient_mutex.lock(); @@ -104,11 +105,11 @@ GetInfo(const char *path, FileInfo &info, Error &error) } if (S_ISREG(st.st_mode)) - info.type = FileInfo::Type::REGULAR; + info.type = StorageFileInfo::Type::REGULAR; else if (S_ISDIR(st.st_mode)) - info.type = FileInfo::Type::DIRECTORY; + info.type = StorageFileInfo::Type::DIRECTORY; else - info.type = FileInfo::Type::OTHER; + info.type = StorageFileInfo::Type::OTHER; info.size = st.st_size; info.mtime = st.st_mtime; @@ -119,7 +120,7 @@ GetInfo(const char *path, FileInfo &info, Error &error) bool SmbclientStorage::GetInfo(const char *uri_utf8, gcc_unused bool follow, - FileInfo &info, Error &error) + StorageFileInfo &info, Error &error) { const std::string mapped = MapUTF8(uri_utf8); return ::GetInfo(mapped.c_str(), info, error); @@ -172,7 +173,8 @@ SmbclientDirectoryReader::Read() } bool -SmbclientDirectoryReader::GetInfo(gcc_unused bool follow, FileInfo &info, +SmbclientDirectoryReader::GetInfo(gcc_unused bool follow, + StorageFileInfo &info, Error &error) { const std::string path = PathTraitsUTF8::Build(base.c_str(), name); -- cgit v1.2.3