From db2e5e5fa6731c02a016ae583732ce1df8fae3b3 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Mon, 24 Jun 2019 19:10:17 -0400
Subject: registered_cache: Add getter to determine source slot in content
 provider union Used to determine StorageId source for application data.

---
 src/core/file_sys/registered_cache.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'src/core/file_sys/registered_cache.cpp')

diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp
index 58917e094..3bb921210 100644
--- a/src/core/file_sys/registered_cache.cpp
+++ b/src/core/file_sys/registered_cache.cpp
@@ -645,6 +645,20 @@ ContentProviderUnion::ListEntriesFilterOrigin(std::optional<ContentProviderUnion
     return out;
 }
 
+std::optional<ContentProviderUnionSlot> ContentProviderUnion::GetSlotForEntry(
+    u64 title_id, ContentRecordType type) const {
+    for (const auto& [slot, provider] : providers) {
+        if (provider == nullptr)
+            continue;
+
+        if (provider->HasEntry(title_id, type)) {
+            return slot;
+        }
+    }
+
+    return std::nullopt;
+}
+
 ManualContentProvider::~ManualContentProvider() = default;
 
 void ManualContentProvider::AddEntry(TitleType title_type, ContentRecordType content_type,
-- 
cgit v1.2.3


From d10fc2d7277cf075f875fe2831501cb79c50e21a Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Tue, 25 Jun 2019 22:25:10 -0400
Subject: glue: Correct missing bytes in ApplicationLaunchParameter

---
 src/core/file_sys/registered_cache.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/core/file_sys/registered_cache.cpp')

diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp
index 3bb921210..4608490e0 100644
--- a/src/core/file_sys/registered_cache.cpp
+++ b/src/core/file_sys/registered_cache.cpp
@@ -647,16 +647,16 @@ ContentProviderUnion::ListEntriesFilterOrigin(std::optional<ContentProviderUnion
 
 std::optional<ContentProviderUnionSlot> ContentProviderUnion::GetSlotForEntry(
     u64 title_id, ContentRecordType type) const {
-    for (const auto& [slot, provider] : providers) {
-        if (provider == nullptr)
-            continue;
+    const auto iter =
+        std::find_if(providers.begin(), providers.end(), [title_id, type](const auto& provider) {
+            return provider.second != nullptr && provider.second->HasEntry(title_id, type);
+        });
 
-        if (provider->HasEntry(title_id, type)) {
-            return slot;
-        }
+    if (iter == providers.end()) {
+        return std::nullopt;
     }
 
-    return std::nullopt;
+    return iter->first;
 }
 
 ManualContentProvider::~ManualContentProvider() = default;
-- 
cgit v1.2.3