summaryrefslogtreecommitdiffstats
path: root/src/core/loader
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-07-29 03:39:42 +0200
committerZach Hilman <zachhilman@gmail.com>2018-08-01 06:16:54 +0200
commit239a3113e4c6a53a2c7b12e67a0f21afae24b0aa (patch)
tree027bc4288f08be240d0b9b2a5f6c6431e76b8b4f /src/core/loader
parentExtract mbedtls to cpp file (diff)
downloadyuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar
yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar.gz
yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar.bz2
yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar.lz
yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar.xz
yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar.zst
yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.zip
Diffstat (limited to 'src/core/loader')
-rw-r--r--src/core/loader/xci.cpp7
-rw-r--r--src/core/loader/xci.h3
2 files changed, 5 insertions, 5 deletions
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<AppLoader_NCA>(
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;