artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #358 from lioncash/explicit

Browse source 
disk_filesystem: Minor changes
This commit is contained in:
bunnei 2018-04-19 22:16:55 -04:00 committed by GitHub
parent 14bf88a777 80982748c8
commit 2ef04f69b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/file_sys/disk_filesystem.cpp
View file

@ -183,7 +183,7 @@ bool Disk_Storage::SetSize(const u64 size) const {
return true; return true;
} }
Disk_Directory::Disk_Directory(const std::string& path) : directory() { Disk_Directory::Disk_Directory(const std::string& path) {
unsigned size = FileUtil::ScanDirectoryTree(path, directory); unsigned size = FileUtil::ScanDirectoryTree(path, directory);
directory.size = size; directory.size = size;
directory.isDirectory = true; directory.isDirectory = true;

5
src/core/file_sys/disk_filesystem.h
View file

@ -43,7 +43,7 @@ protected:
class Disk_Storage : public StorageBackend { class Disk_Storage : public StorageBackend {
public: public:
Disk_Storage(std::shared_ptr<FileUtil::IOFile> file) : file(std::move(file)) {} explicit Disk_Storage(std::shared_ptr<FileUtil::IOFile> file) : file(std::move(file)) {}
ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override; ResultVal<size_t> Read(u64 offset, size_t length, u8* buffer) const override;
ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) const override; ResultVal<size_t> Write(u64 offset, size_t length, bool flush, const u8* buffer) const override;
@ -60,7 +60,7 @@ private:
class Disk_Directory : public DirectoryBackend { class Disk_Directory : public DirectoryBackend {
public: public:
Disk_Directory(const std::string& path); explicit Disk_Directory(const std::string& path);
~Disk_Directory() override { ~Disk_Directory() override {
Close(); Close();
@ -74,7 +74,6 @@ public:
} }
protected: protected:
u32 total_entries_in_directory;
FileUtil::FSTEntry directory; FileUtil::FSTEntry directory;
// We need to remember the last entry we returned, so a subsequent call to Read will continue // We need to remember the last entry we returned, so a subsequent call to Read will continue