Aphcity/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity Actions

nca_metadata: Remove unnecessary reference to base file

Browse source
This commit is contained in:
Zach Hilman 2018-08-10 20:47:51 -04:00
parent 62e859c6c7
commit 22bdddd6f0
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/file_sys/nca_metadata.cpp
View file

@ -10,7 +10,7 @@
namespace FileSys { namespace FileSys {
CNMT::CNMT(VirtualFile file_) : file(std::move(file_)), header(std::make_unique<CNMTHeader>()) { CNMT::CNMT(VirtualFile file) : header(std::make_unique<CNMTHeader>()) {
if (file->ReadObject(header.get()) != sizeof(CNMTHeader)) if (file->ReadObject(header.get()) != sizeof(CNMTHeader))
return; return;
@ -41,7 +41,7 @@ CNMT::CNMT(VirtualFile file_) : file(std::move(file_)), header(std::make_unique<
CNMT::CNMT(CNMTHeader header, OptionalHeader opt_header, std::vector<ContentRecord> content_records, CNMT::CNMT(CNMTHeader header, OptionalHeader opt_header, std::vector<ContentRecord> content_records,
std::vector<MetaRecord> meta_records) std::vector<MetaRecord> meta_records)
: file(nullptr), header(std::make_unique<CNMTHeader>(std::move(header))), : header(std::make_unique<CNMTHeader>(std::move(header))),
opt_header(std::make_unique<OptionalHeader>(std::move(opt_header))), opt_header(std::make_unique<OptionalHeader>(std::move(opt_header))),
content_records(std::move(content_records)), meta_records(std::move(meta_records)) {} content_records(std::move(content_records)), meta_records(std::move(meta_records)) {}

1
src/core/file_sys/nca_metadata.h
View file

@ -96,7 +96,6 @@ public:
std::vector<u8> Serialize() const; std::vector<u8> Serialize() const;
private: private:
VirtualFile file;
std::unique_ptr<CNMTHeader> header; std::unique_ptr<CNMTHeader> header;
std::unique_ptr<OptionalHeader> opt_header; std::unique_ptr<OptionalHeader> opt_header;
std::vector<ContentRecord> content_records; std::vector<ContentRecord> content_records;