Browse Source
Merge pull request #358 from lioncash/explicit
disk_filesystem: Minor changes
pull/15/merge
bunnei
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
4 deletions
-
src/core/file_sys/disk_filesystem.cpp
-
src/core/file_sys/disk_filesystem.h
|
|
|
@ -183,7 +183,7 @@ bool Disk_Storage::SetSize(const u64 size) const { |
|
|
|
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); |
|
|
|
directory.size = size; |
|
|
|
directory.isDirectory = true; |
|
|
|
|
|
|
|
@ -43,7 +43,7 @@ protected: |
|
|
|
|
|
|
|
class Disk_Storage : public StorageBackend { |
|
|
|
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> Write(u64 offset, size_t length, bool flush, const u8* buffer) const override; |
|
|
|
@ -60,7 +60,7 @@ private: |
|
|
|
|
|
|
|
class Disk_Directory : public DirectoryBackend { |
|
|
|
public: |
|
|
|
Disk_Directory(const std::string& path); |
|
|
|
explicit Disk_Directory(const std::string& path); |
|
|
|
|
|
|
|
~Disk_Directory() override { |
|
|
|
Close(); |
|
|
|
@ -74,7 +74,6 @@ public: |
|
|
|
} |
|
|
|
|
|
|
|
protected: |
|
|
|
u32 total_entries_in_directory; |
|
|
|
FileUtil::FSTEntry directory; |
|
|
|
|
|
|
|
// We need to remember the last entry we returned, so a subsequent call to Read will continue |
|
|
|
|