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 | |
| 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')
| -rw-r--r-- | src/core/loader/xci.cpp | 7 | ||||
| -rw-r--r-- | src/core/loader/xci.h | 3 |
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) | |||
| 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 |
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 { | |||
| 13 | class AppLoader_XCI final : public AppLoader { | 13 | class AppLoader_XCI final : public AppLoader { |
| 14 | public: | 14 | public: |
| 15 | explicit AppLoader_XCI(FileSys::VirtualFile file); | 15 | explicit AppLoader_XCI(FileSys::VirtualFile file); |
| 16 | ~AppLoader_XCI(); | ||
| 16 | 17 | ||
| 17 | /** | 18 | /** |
| 18 | * Returns the type of the file | 19 | * Returns the type of the file |
| @@ -30,8 +31,6 @@ public: | |||
| 30 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; | 31 | ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; |
| 31 | ResultStatus ReadProgramId(u64& out_program_id) override; | 32 | ResultStatus ReadProgramId(u64& out_program_id) override; |
| 32 | 33 | ||
| 33 | ~AppLoader_XCI(); | ||
| 34 | |||
| 35 | private: | 34 | private: |
| 36 | FileSys::ProgramMetadata metadata; | 35 | FileSys::ProgramMetadata metadata; |
| 37 | 36 | ||