franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #701 from lioncash/moving 

content_archive: Minor changes
This commit is contained in:
bunnei 2018-07-19 08:41:42 -07:00 committed by GitHub
parent 758c357868 4790bb907d
commit 1bf7ae79c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/file_sys/content_archive.cpp
View File

@ -2,6 +2,9 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <utility>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/file_sys/content_archive.h" #include "core/file_sys/content_archive.h"
#include "core/file_sys/vfs_offset.h" #include "core/file_sys/vfs_offset.h"
@ -61,7 +64,7 @@ struct RomFSSuperblock {
}; };
static_assert(sizeof(RomFSSuperblock) == 0xE8, "RomFSSuperblock has incorrect size."); static_assert(sizeof(RomFSSuperblock) == 0xE8, "RomFSSuperblock has incorrect size.");
NCA::NCA(VirtualFile file_) : file(file_) { NCA::NCA(VirtualFile file_) : file(std::move(file_)) {
if (sizeof(NCAHeader) != file->ReadObject(&header)) if (sizeof(NCAHeader) != file->ReadObject(&header))
LOG_CRITICAL(Loader, "File reader errored out during header read."); LOG_CRITICAL(Loader, "File reader errored out during header read.");

7
src/core/file_sys/content_archive.h
View File

@ -4,6 +4,11 @@
#pragma once #pragma once
#include <array>
#include <memory>
#include <string>
#include <vector>
#include "common/common_funcs.h" #include "common/common_funcs.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/swap.h" #include "common/swap.h"
@ -48,7 +53,7 @@ struct NCAHeader {
}; };
static_assert(sizeof(NCAHeader) == 0x400, "NCAHeader has incorrect size."); static_assert(sizeof(NCAHeader) == 0x400, "NCAHeader has incorrect size.");
inline bool IsDirectoryExeFS(std::shared_ptr<FileSys::VfsDirectory> pfs) { inline bool IsDirectoryExeFS(const std::shared_ptr<VfsDirectory>& pfs) {
// According to switchbrew, an exefs must only contain these two files: // According to switchbrew, an exefs must only contain these two files:
return pfs->GetFile("main") != nullptr && pfs->GetFile("main.npdm") != nullptr; return pfs->GetFile("main") != nullptr && pfs->GetFile("main.npdm") != nullptr;
} }