diff options
| author | 2018-07-28 21:39:42 -0400 | |
|---|---|---|
| committer | 2018-08-01 00:16:54 -0400 | |
| commit | 239a3113e4c6a53a2c7b12e67a0f21afae24b0aa (patch) | |
| tree | 027bc4288f08be240d0b9b2a5f6c6431e76b8b4f /src/core/loader/xci.cpp | |
| parent | Extract mbedtls to cpp file (diff) | |
| download | yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar.gz yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.tar.xz yuzu-239a3113e4c6a53a2c7b12e67a0f21afae24b0aa.zip | |
Make XCI comply to review and style guidelines
Diffstat (limited to 'src/core/loader/xci.cpp')
| -rw-r--r-- | src/core/loader/xci.cpp | 7 |
1 files changed, 4 insertions, 3 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) | |||
| 28 | nca_loader(std::make_unique<AppLoader_NCA>( | 28 | nca_loader(std::make_unique<AppLoader_NCA>( |
| 29 | xci->GetNCAFileByType(FileSys::NCAContentType::Program))) {} | 29 | xci->GetNCAFileByType(FileSys::NCAContentType::Program))) {} |
| 30 | 30 | ||
| 31 | AppLoader_XCI::~AppLoader_XCI() = default; | ||
| 32 | |||
| 31 | FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& file) { | 33 | FileType AppLoader_XCI::IdentifyType(const FileSys::VirtualFile& file) { |
| 32 | FileSys::XCI xci(file); | 34 | FileSys::XCI xci(file); |
| 33 | 35 | ||
| 34 | if (xci.GetStatus() == ResultStatus::Success && | 36 | if (xci.GetStatus() == ResultStatus::Success && |
| 35 | xci.GetNCAByType(FileSys::NCAContentType::Program) != nullptr && | 37 | xci.GetNCAByType(FileSys::NCAContentType::Program) != nullptr && |
| 36 | AppLoader_NCA::IdentifyType(xci.GetNCAFileByType(FileSys::NCAContentType::Program)) == | 38 | AppLoader_NCA::IdentifyType(xci.GetNCAFileByType(FileSys::NCAContentType::Program)) == |
| 37 | FileType::NCA) | 39 | FileType::NCA) { |
| 38 | return FileType::XCI; | 40 | return FileType::XCI; |
| 41 | } | ||
| 39 | 42 | ||
| 40 | return FileType::Error; | 43 | return FileType::Error; |
| 41 | } | 44 | } |
| @@ -62,6 +65,4 @@ ResultStatus AppLoader_XCI::ReadProgramId(u64& out_program_id) { | |||
| 62 | return nca_loader->ReadProgramId(out_program_id); | 65 | return nca_loader->ReadProgramId(out_program_id); |
| 63 | } | 66 | } |
| 64 | 67 | ||
| 65 | AppLoader_XCI::~AppLoader_XCI() = default; | ||
| 66 | |||
| 67 | } // namespace Loader | 68 | } // namespace Loader |