diff options
author | Lioncash <mathew1800@gmail.com> | 2019-06-12 23:27:06 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-06-12 23:54:05 +0200 |
commit | a62088539ed02a8569814601b3b99b713c5d8a34 (patch) | |
tree | 03fe279e7651c55291f702f5a8b518cb07e35812 /src/core/file_sys/registered_cache.cpp | |
parent | Merge pull request #2578 from lioncash/cnmt (diff) | |
download | yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.gz yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.bz2 yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.lz yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.xz yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.tar.zst yuzu-a62088539ed02a8569814601b3b99b713c5d8a34.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/registered_cache.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 3946ff871..58917e094 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -53,13 +53,14 @@ static bool FollowsNcaIdFormat(std::string_view name) { static std::string GetRelativePathFromNcaID(const std::array<u8, 16>& nca_id, bool second_hex_upper, bool within_two_digit) { - if (!within_two_digit) - return fmt::format("/{}.nca", Common::HexArrayToString(nca_id, second_hex_upper)); + if (!within_two_digit) { + return fmt::format("/{}.nca", Common::HexToString(nca_id, second_hex_upper)); + } Core::Crypto::SHA256Hash hash{}; mbedtls_sha256(nca_id.data(), nca_id.size(), hash.data(), 0); return fmt::format("/000000{:02X}/{}.nca", hash[0], - Common::HexArrayToString(nca_id, second_hex_upper)); + Common::HexToString(nca_id, second_hex_upper)); } static std::string GetCNMTName(TitleType type, u64 title_id) { @@ -376,10 +377,11 @@ std::vector<ContentProviderEntry> RegisteredCache::ListEntriesFilter( } static std::shared_ptr<NCA> GetNCAFromNSPForID(const NSP& nsp, const NcaID& id) { - const auto file = nsp.GetFile(fmt::format("{}.nca", Common::HexArrayToString(id, false))); - if (file == nullptr) + auto file = nsp.GetFile(fmt::format("{}.nca", Common::HexToString(id, false))); + if (file == nullptr) { return nullptr; - return std::make_shared<NCA>(file); + } + return std::make_shared<NCA>(std::move(file)); } InstallResult RegisteredCache::InstallEntry(const XCI& xci, bool overwrite_if_exists, |