artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

content_archive: Simpify assignment of bktr_base_romfs in the constructor

Browse source 
std::move doesn't actually dereference the data, so it doesn't matter
whether or not the type is null.
This commit is contained in:
Lioncash 2018-10-16 13:16:02 -04:00
parent 441b5b97bd
commit 871350ae35
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/file_sys/content_archive.cpp
View file

@ -103,8 +103,7 @@ static bool IsValidNCA(const NCAHeader& header) {
} }
NCA::NCA(VirtualFile file_, VirtualFile bktr_base_romfs_, u64 bktr_base_ivfc_offset) NCA::NCA(VirtualFile file_, VirtualFile bktr_base_romfs_, u64 bktr_base_ivfc_offset)
: file(std::move(file_)), : file(std::move(file_)), bktr_base_romfs(std::move(bktr_base_romfs_)) {
bktr_base_romfs(bktr_base_romfs_ ? std::move(bktr_base_romfs_) : nullptr) {
if (file == nullptr) { if (file == nullptr) {
status = Loader::ResultStatus::ErrorNullFile; status = Loader::ResultStatus::ErrorNullFile;
return; return;