citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #3596 from lioncash/disk 

disk_archive: Minor miscellaneous cleanup
This commit is contained in:
Merry 2018-03-31 10:39:00 +01:00 committed by GitHub
parent 5b9253d710 0e7ca706dc
commit 587bc06adf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/file_sys/disk_archive.cpp
View File

@ -52,7 +52,7 @@ bool DiskFile::Close() const {
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
DiskDirectory::DiskDirectory(const std::string& path) : directory() { DiskDirectory::DiskDirectory(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;

7
src/core/file_sys/disk_archive.h
View File

@ -46,21 +46,20 @@ protected:
class DiskDirectory : public DirectoryBackend { class DiskDirectory : public DirectoryBackend {
public: public:
DiskDirectory(const std::string& path); explicit DiskDirectory(const std::string& path);
~DiskDirectory() override { ~DiskDirectory() override {
Close(); Close();
} }
u32 Read(const u32 count, Entry* entries) override; u32 Read(u32 count, Entry* entries) override;
bool Close() const override { bool Close() const override {
return true; return true;
} }
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
// from the next one. This iterator will always point to the next unread entry. // from the next one. This iterator will always point to the next unread entry.