diff options
| author | 2019-04-23 14:38:18 -0400 | |
|---|---|---|
| committer | 2019-09-21 16:50:39 -0400 | |
| commit | a49169e81906d230fd6bfc7546acc6f763f4c321 (patch) | |
| tree | eceaf472b9e52755b333f0945d14c4bddc1b741c /src/core/file_sys | |
| parent | yuzu: Add UI to manage filesystem paths and sizes (diff) | |
| download | yuzu-a49169e81906d230fd6bfc7546acc6f763f4c321.tar.gz yuzu-a49169e81906d230fd6bfc7546acc6f763f4c321.tar.xz yuzu-a49169e81906d230fd6bfc7546acc6f763f4c321.zip | |
filesystem: Add const qualification to various accessors
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/romfs_factory.cpp | 5 | ||||
| -rw-r--r-- | src/core/file_sys/romfs_factory.h | 4 | ||||
| -rw-r--r-- | src/core/file_sys/savedata_factory.cpp | 7 | ||||
| -rw-r--r-- | src/core/file_sys/savedata_factory.h | 7 | ||||
| -rw-r--r-- | src/core/file_sys/sdmc_factory.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/sdmc_factory.h | 2 |
6 files changed, 15 insertions, 12 deletions
diff --git a/src/core/file_sys/romfs_factory.cpp b/src/core/file_sys/romfs_factory.cpp index c3ee4a158..84cd4684c 100644 --- a/src/core/file_sys/romfs_factory.cpp +++ b/src/core/file_sys/romfs_factory.cpp | |||
| @@ -35,7 +35,7 @@ void RomFSFactory::SetPackedUpdate(VirtualFile update_raw) { | |||
| 35 | this->update_raw = std::move(update_raw); | 35 | this->update_raw = std::move(update_raw); |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | ResultVal<VirtualFile> RomFSFactory::OpenCurrentProcess() { | 38 | ResultVal<VirtualFile> RomFSFactory::OpenCurrentProcess() const { |
| 39 | if (!updatable) | 39 | if (!updatable) |
| 40 | return MakeResult<VirtualFile>(file); | 40 | return MakeResult<VirtualFile>(file); |
| 41 | 41 | ||
| @@ -44,7 +44,8 @@ ResultVal<VirtualFile> RomFSFactory::OpenCurrentProcess() { | |||
| 44 | patch_manager.PatchRomFS(file, ivfc_offset, ContentRecordType::Program, update_raw)); | 44 | patch_manager.PatchRomFS(file, ivfc_offset, ContentRecordType::Program, update_raw)); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | ResultVal<VirtualFile> RomFSFactory::Open(u64 title_id, StorageId storage, ContentRecordType type) { | 47 | ResultVal<VirtualFile> RomFSFactory::Open(u64 title_id, StorageId storage, |
| 48 | ContentRecordType type) const { | ||
| 48 | std::shared_ptr<NCA> res; | 49 | std::shared_ptr<NCA> res; |
| 49 | 50 | ||
| 50 | switch (storage) { | 51 | switch (storage) { |
diff --git a/src/core/file_sys/romfs_factory.h b/src/core/file_sys/romfs_factory.h index 7724c0b23..da63a313a 100644 --- a/src/core/file_sys/romfs_factory.h +++ b/src/core/file_sys/romfs_factory.h | |||
| @@ -33,8 +33,8 @@ public: | |||
| 33 | ~RomFSFactory(); | 33 | ~RomFSFactory(); |
| 34 | 34 | ||
| 35 | void SetPackedUpdate(VirtualFile update_raw); | 35 | void SetPackedUpdate(VirtualFile update_raw); |
| 36 | ResultVal<VirtualFile> OpenCurrentProcess(); | 36 | ResultVal<VirtualFile> OpenCurrentProcess() const; |
| 37 | ResultVal<VirtualFile> Open(u64 title_id, StorageId storage, ContentRecordType type); | 37 | ResultVal<VirtualFile> Open(u64 title_id, StorageId storage, ContentRecordType type) const; |
| 38 | 38 | ||
| 39 | private: | 39 | private: |
| 40 | VirtualFile file; | 40 | VirtualFile file; |
diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index c63815332..f77cc02ac 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp | |||
| @@ -71,7 +71,7 @@ SaveDataFactory::SaveDataFactory(VirtualDir save_directory) : dir(std::move(save | |||
| 71 | SaveDataFactory::~SaveDataFactory() = default; | 71 | SaveDataFactory::~SaveDataFactory() = default; |
| 72 | 72 | ||
| 73 | ResultVal<VirtualDir> SaveDataFactory::Create(SaveDataSpaceId space, | 73 | ResultVal<VirtualDir> SaveDataFactory::Create(SaveDataSpaceId space, |
| 74 | const SaveDataDescriptor& meta) { | 74 | const SaveDataDescriptor& meta) const { |
| 75 | PrintSaveDataDescriptorWarnings(meta); | 75 | PrintSaveDataDescriptorWarnings(meta); |
| 76 | 76 | ||
| 77 | const auto save_directory = | 77 | const auto save_directory = |
| @@ -88,7 +88,8 @@ ResultVal<VirtualDir> SaveDataFactory::Create(SaveDataSpaceId space, | |||
| 88 | return MakeResult<VirtualDir>(std::move(out)); | 88 | return MakeResult<VirtualDir>(std::move(out)); |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | ResultVal<VirtualDir> SaveDataFactory::Open(SaveDataSpaceId space, const SaveDataDescriptor& meta) { | 91 | ResultVal<VirtualDir> SaveDataFactory::Open(SaveDataSpaceId space, |
| 92 | const SaveDataDescriptor& meta) const { | ||
| 92 | 93 | ||
| 93 | const auto save_directory = | 94 | const auto save_directory = |
| 94 | GetFullPath(space, meta.type, meta.title_id, meta.user_id, meta.save_id); | 95 | GetFullPath(space, meta.type, meta.title_id, meta.user_id, meta.save_id); |
| @@ -165,7 +166,7 @@ SaveDataSize SaveDataFactory::ReadSaveDataSize(SaveDataType type, u64 title_id, | |||
| 165 | } | 166 | } |
| 166 | 167 | ||
| 167 | void SaveDataFactory::WriteSaveDataSize(SaveDataType type, u64 title_id, u128 user_id, | 168 | void SaveDataFactory::WriteSaveDataSize(SaveDataType type, u64 title_id, u128 user_id, |
| 168 | SaveDataSize new_value) { | 169 | SaveDataSize new_value) const { |
| 169 | const auto path = GetFullPath(SaveDataSpaceId::NandUser, type, title_id, user_id, 0); | 170 | const auto path = GetFullPath(SaveDataSpaceId::NandUser, type, title_id, user_id, 0); |
| 170 | const auto dir = GetOrCreateDirectoryRelative(this->dir, path); | 171 | const auto dir = GetOrCreateDirectoryRelative(this->dir, path); |
| 171 | 172 | ||
diff --git a/src/core/file_sys/savedata_factory.h b/src/core/file_sys/savedata_factory.h index 738038ee0..991e57aa1 100644 --- a/src/core/file_sys/savedata_factory.h +++ b/src/core/file_sys/savedata_factory.h | |||
| @@ -64,8 +64,8 @@ public: | |||
| 64 | explicit SaveDataFactory(VirtualDir dir); | 64 | explicit SaveDataFactory(VirtualDir dir); |
| 65 | ~SaveDataFactory(); | 65 | ~SaveDataFactory(); |
| 66 | 66 | ||
| 67 | ResultVal<VirtualDir> Create(SaveDataSpaceId space, const SaveDataDescriptor& meta); | 67 | ResultVal<VirtualDir> Create(SaveDataSpaceId space, const SaveDataDescriptor& meta) const; |
| 68 | ResultVal<VirtualDir> Open(SaveDataSpaceId space, const SaveDataDescriptor& meta); | 68 | ResultVal<VirtualDir> Open(SaveDataSpaceId space, const SaveDataDescriptor& meta) const; |
| 69 | 69 | ||
| 70 | VirtualDir GetSaveDataSpaceDirectory(SaveDataSpaceId space) const; | 70 | VirtualDir GetSaveDataSpaceDirectory(SaveDataSpaceId space) const; |
| 71 | 71 | ||
| @@ -74,7 +74,8 @@ public: | |||
| 74 | u128 user_id, u64 save_id); | 74 | u128 user_id, u64 save_id); |
| 75 | 75 | ||
| 76 | SaveDataSize ReadSaveDataSize(SaveDataType type, u64 title_id, u128 user_id) const; | 76 | SaveDataSize ReadSaveDataSize(SaveDataType type, u64 title_id, u128 user_id) const; |
| 77 | void WriteSaveDataSize(SaveDataType type, u64 title_id, u128 user_id, SaveDataSize new_value); | 77 | void WriteSaveDataSize(SaveDataType type, u64 title_id, u128 user_id, |
| 78 | SaveDataSize new_value) const; | ||
| 78 | 79 | ||
| 79 | private: | 80 | private: |
| 80 | VirtualDir dir; | 81 | VirtualDir dir; |
diff --git a/src/core/file_sys/sdmc_factory.cpp b/src/core/file_sys/sdmc_factory.cpp index 743e2e63a..5113a1ca6 100644 --- a/src/core/file_sys/sdmc_factory.cpp +++ b/src/core/file_sys/sdmc_factory.cpp | |||
| @@ -21,7 +21,7 @@ SDMCFactory::SDMCFactory(VirtualDir dir_) | |||
| 21 | 21 | ||
| 22 | SDMCFactory::~SDMCFactory() = default; | 22 | SDMCFactory::~SDMCFactory() = default; |
| 23 | 23 | ||
| 24 | ResultVal<VirtualDir> SDMCFactory::Open() { | 24 | ResultVal<VirtualDir> SDMCFactory::Open() const { |
| 25 | return MakeResult<VirtualDir>(dir); | 25 | return MakeResult<VirtualDir>(dir); |
| 26 | } | 26 | } |
| 27 | 27 | ||
diff --git a/src/core/file_sys/sdmc_factory.h b/src/core/file_sys/sdmc_factory.h index 164fd9435..42dc4e08a 100644 --- a/src/core/file_sys/sdmc_factory.h +++ b/src/core/file_sys/sdmc_factory.h | |||
| @@ -19,7 +19,7 @@ public: | |||
| 19 | explicit SDMCFactory(VirtualDir dir); | 19 | explicit SDMCFactory(VirtualDir dir); |
| 20 | ~SDMCFactory(); | 20 | ~SDMCFactory(); |
| 21 | 21 | ||
| 22 | ResultVal<VirtualDir> Open(); | 22 | ResultVal<VirtualDir> Open() const; |
| 23 | 23 | ||
| 24 | VirtualDir GetSDMCContentDirectory() const; | 24 | VirtualDir GetSDMCContentDirectory() const; |
| 25 | 25 | ||