mctaylors/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

registered_cache: Make use of designated initializers

Browse source 
Removes the need for comments to indicate the fields being assigned.
This commit is contained in:
Lioncash 2020-08-23 10:26:18 -04:00
parent 3ea3de4ecd
commit f83c6e1e0c
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/core/file_sys/registered_cache.cpp
View file

@ -621,25 +621,25 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
InstallResult RegisteredCache::InstallEntry(const NCA& nca, TitleType type, InstallResult RegisteredCache::InstallEntry(const NCA& nca, TitleType type,
bool overwrite_if_exists, const VfsCopyFunction& copy) { bool overwrite_if_exists, const VfsCopyFunction& copy) {
CNMTHeader header{ const CNMTHeader header{
nca.GetTitleId(), // Title ID .title_id = nca.GetTitleId(),
0, // Ignore/Default title version .title_version = 0,
type, // Type .type = type,
{}, // Padding .reserved = {},
0x10, // Default table offset .table_offset = 0x10,
1, // 1 Content Entry .number_content_entries = 1,
0, // No Meta Entries .number_meta_entries = 0,
{}, // Padding .attributes = 0,
{}, // Reserved 1 .reserved2 = {},
0, // Is committed .is_committed = 0,
0, // Required download system version .required_download_system_version = 0,
{}, // Reserved 2 .reserved3 = {},
}; };
OptionalHeader opt_header{0, 0}; const OptionalHeader opt_header{0, 0};
ContentRecord c_rec{{}, {}, {}, GetCRTypeFromNCAType(nca.GetType()), {}}; ContentRecord c_rec{{}, {}, {}, GetCRTypeFromNCAType(nca.GetType()), {}};
const auto& data = nca.GetBaseFile()->ReadBytes(0x100000); const auto& data = nca.GetBaseFile()->ReadBytes(0x100000);
mbedtls_sha256_ret(data.data(), data.size(), c_rec.hash.data(), 0); mbedtls_sha256_ret(data.data(), data.size(), c_rec.hash.data(), 0);
memcpy(&c_rec.nca_id, &c_rec.hash, 16); std::memcpy(&c_rec.nca_id, &c_rec.hash, 16);
const CNMT new_cnmt(header, opt_header, {c_rec}, {}); const CNMT new_cnmt(header, opt_header, {c_rec}, {});
if (!RawInstallYuzuMeta(new_cnmt)) { if (!RawInstallYuzuMeta(new_cnmt)) {
return InstallResult::ErrorMetaFailed; return InstallResult::ErrorMetaFailed;