summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-04-19 22:16:55 -0400
committerGravatar GitHub2018-04-19 22:16:55 -0400
commit2ef04f69b2e6288b42311100a9c5588f91dcd7c1 (patch)
treea7741a3c50febf3f7bd2f097e413f1fe24aae8af /src
parentMerge pull request #359 from lioncash/redundant (diff)
parentdisk_filesystem: Remove unused total_entries_in_directory member from Disk_Di... (diff)
downloadyuzu-2ef04f69b2e6288b42311100a9c5588f91dcd7c1.tar.gz
yuzu-2ef04f69b2e6288b42311100a9c5588f91dcd7c1.tar.xz
yuzu-2ef04f69b2e6288b42311100a9c5588f91dcd7c1.zip
Merge pull request #358 from lioncash/explicit
disk_filesystem: Minor changes
Diffstat (limited to 'src')
-rw-r--r--src/core/file_sys/disk_filesystem.cpp2
-rw-r--r--src/core/file_sys/disk_filesystem.h5
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/file_sys/disk_filesystem.cpp b/src/core/file_sys/disk_filesystem.cpp
index 263392930..ca1323873 100644
--- a/src/core/file_sys/disk_filesystem.cpp
+++ b/src/core/file_sys/disk_filesystem.cpp
@@ -183,7 +183,7 @@ bool Disk_Storage::SetSize(const u64 size) const {
183 return true; 183 return true;
184} 184}
185 185
186Disk_Directory::Disk_Directory(const std::string& path) : directory() { 186Disk_Directory::Disk_Directory(const std::string& path) {
187 unsigned size = FileUtil::ScanDirectoryTree(path, directory); 187 unsigned size = FileUtil::ScanDirectoryTree(path, directory);
188 directory.size = size; 188 directory.size = size;
189 directory.isDirectory = true; 189 directory.isDirectory = true;
diff --git a/src/core/file_sys/disk_filesystem.h b/src/core/file_sys/disk_filesystem.h
index 05a29bc3a..8f9e1145a 100644
--- a/src/core/file_sys/disk_filesystem.h
+++ b/src/core/file_sys/disk_filesystem.h
@@ -43,7 +43,7 @@ protected:
43 43
44class Disk_Storage : public StorageBackend { 44class Disk_Storage : public StorageBackend {
45public: 45public:
46 Disk_Storage(std::shared_ptr<FileUtil::IOFile> file) : file(std::move(file)) {} 46 explicit Disk_Storage(std::shared_ptr<FileUtil::IOFile> file) : file(std::move(file)) {}
47 47
48 ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override; 48 ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override;
49 ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) const override; 49 ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) const override;
@@ -60,7 +60,7 @@ private:
60 60
61class Disk_Directory : public DirectoryBackend { 61class Disk_Directory : public DirectoryBackend {
62public: 62public:
63 Disk_Directory(const std::string& path); 63 explicit Disk_Directory(const std::string& path);
64 64
65 ~Disk_Directory() override { 65 ~Disk_Directory() override {
66 Close(); 66 Close();
@@ -74,7 +74,6 @@ public:
74 } 74 }
75 75
76protected: 76protected:
77 u32 total_entries_in_directory;
78 FileUtil::FSTEntry directory; 77 FileUtil::FSTEntry directory;
79 78
80 // We need to remember the last entry we returned, so a subsequent call to Read will continue 79 // We need to remember the last entry we returned, so a subsequent call to Read will continue