summaryrefslogtreecommitdiffstats
path: root/src/core/file_sys
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-03 20:26:45 +0200
committerGitHub <noreply@github.com>2020-08-03 20:26:45 +0200
commita971667d1f52b9b150d473e4bf99f9c4f6b732b1 (patch)
tree5690105ba5c390f4760522ed5be5a3027604574b /src/core/file_sys
parentMerge pull request #4471 from ogniK5377/sm-getservice-concept (diff)
parentregistered_cache: Resolve -Wmaybe_uninitialized warnings (diff)
downloadyuzu-a971667d1f52b9b150d473e4bf99f9c4f6b732b1.tar
yuzu-a971667d1f52b9b150d473e4bf99f9c4f6b732b1.tar.gz
yuzu-a971667d1f52b9b150d473e4bf99f9c4f6b732b1.tar.bz2
yuzu-a971667d1f52b9b150d473e4bf99f9c4f6b732b1.tar.lz
yuzu-a971667d1f52b9b150d473e4bf99f9c4f6b732b1.tar.xz
yuzu-a971667d1f52b9b150d473e4bf99f9c4f6b732b1.tar.zst
yuzu-a971667d1f52b9b150d473e4bf99f9c4f6b732b1.zip
Diffstat (limited to 'src/core/file_sys')
-rw-r--r--src/core/file_sys/registered_cache.cpp25
1 files changed, 15 insertions, 10 deletions
diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp
index e94eed3b6..f831487dd 100644
--- a/src/core/file_sys/registered_cache.cpp
+++ b/src/core/file_sys/registered_cache.cpp
@@ -344,15 +344,18 @@ VirtualFile RegisteredCache::GetFileAtID(NcaID id) const {
static std::optional<NcaID> CheckMapForContentRecord(const std::map<u64, CNMT>& map, u64 title_id,
ContentRecordType type) {
- if (map.find(title_id) == map.end())
- return {};
-
- const auto& cnmt = map.at(title_id);
+ const auto cmnt_iter = map.find(title_id);
+ if (cmnt_iter == map.cend()) {
+ return std::nullopt;
+ }
- const auto iter = std::find_if(cnmt.GetContentRecords().begin(), cnmt.GetContentRecords().end(),
+ const auto& cnmt = cmnt_iter->second;
+ const auto& content_records = cnmt.GetContentRecords();
+ const auto iter = std::find_if(content_records.cbegin(), content_records.cend(),
[type](const ContentRecord& rec) { return rec.type == type; });
- if (iter == cnmt.GetContentRecords().end())
- return {};
+ if (iter == content_records.cend()) {
+ return std::nullopt;
+ }
return std::make_optional(iter->nca_id);
}
@@ -467,14 +470,16 @@ VirtualFile RegisteredCache::GetEntryUnparsed(u64 title_id, ContentRecordType ty
std::optional<u32> RegisteredCache::GetEntryVersion(u64 title_id) const {
const auto meta_iter = meta.find(title_id);
- if (meta_iter != meta.end())
+ if (meta_iter != meta.cend()) {
return meta_iter->second.GetTitleVersion();
+ }
const auto yuzu_meta_iter = yuzu_meta.find(title_id);
- if (yuzu_meta_iter != yuzu_meta.end())
+ if (yuzu_meta_iter != yuzu_meta.cend()) {
return yuzu_meta_iter->second.GetTitleVersion();
+ }
- return {};
+ return std::nullopt;
}
VirtualFile RegisteredCache::GetEntryRaw(u64 title_id, ContentRecordType type) const {