From 239a3113e4c6a53a2c7b12e67a0f21afae24b0aa Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sat, 28 Jul 2018 21:39:42 -0400 Subject: Make XCI comply to review and style guidelines --- src/core/loader/xci.cpp | 7 ++++--- src/core/loader/xci.h | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/loader') diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index 9759e33d1..b4de5bd16 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -28,14 +28,17 @@ AppLoader_XCI::AppLoader_XCI(FileSys::VirtualFile file) nca_loader(std::make_unique( xci->GetNCAFileByType(FileSys::NCAContentType::Program))) {} +AppLoader_XCI::~AppLoader_XCI() = default; + FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& file) { FileSys::XCI xci(file); if (xci.GetStatus() == ResultStatus::Success && xci.GetNCAByType(FileSys::NCAContentType::Program) != nullptr && AppLoader_NCA::IdentifyType(xci.GetNCAFileByType(FileSys::NCAContentType::Program)) == - FileType::NCA) + FileType::NCA) { return FileType::XCI; + } return FileType::Error; } @@ -62,6 +65,4 @@ ResultStatus AppLoader_XCI::ReadProgramId(u64& out_program_id) { return nca_loader->ReadProgramId(out_program_id); } -AppLoader_XCI::~AppLoader_XCI() = default; - } // namespace Loader diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index a9cee1ca3..2a09caa5f 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h @@ -13,6 +13,7 @@ namespace Loader { class AppLoader_XCI final : public AppLoader { public: explicit AppLoader_XCI(FileSys::VirtualFile file); + ~AppLoader_XCI(); /** * Returns the type of the file @@ -30,8 +31,6 @@ public: ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; ResultStatus ReadProgramId(u64& out_program_id) override; - ~AppLoader_XCI(); - private: FileSys::ProgramMetadata metadata; -- cgit v1.2.3