diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 11:29:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-21 11:29:48 -0700 |
commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/core/loader/ncch.h | |
parent | 2a910a6d883f2227edc74aacf5b93a58a3dea07c (diff) | |
parent | 0e3f0120a8ec2996e73bb6b7b6c9d7531f7a7eb1 (diff) |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/core/loader/ncch.h')
-rw-r--r-- | src/core/loader/ncch.h | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index 75609ee57..04350d006 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h @@ -5,11 +5,9 @@ #pragma once #include <memory> - #include "common/bit_field.h" #include "common/common_types.h" #include "common/swap.h" - #include "core/loader/loader.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -164,7 +162,7 @@ namespace Loader { class AppLoader_NCCH final : public AppLoader { public: AppLoader_NCCH(FileUtil::IOFile&& file, const std::string& filepath) - : AppLoader(std::move(file)), filepath(filepath) { } + : AppLoader(std::move(file)), filepath(filepath) {} /** * Returns the type of the file @@ -222,10 +220,10 @@ public: * @param size Size of the RomFS in bytes * @return ResultStatus result of function */ - ResultStatus ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset, u64& size) override; + ResultStatus ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset, + u64& size) override; private: - /** * Reads an application ExeFS section of an NCCH file into AppLoader (e.g. .code, .logo, etc.) * @param name Name of section to read out of NCCH file @@ -246,24 +244,24 @@ private: */ ResultStatus LoadExeFS(); - bool is_exefs_loaded = false; - bool is_compressed = false; - - u32 entry_point = 0; - u32 code_size = 0; - u32 stack_size = 0; - u32 bss_size = 0; - u32 core_version = 0; - u8 priority = 0; - u8 resource_limit_category = 0; - u32 ncch_offset = 0; // Offset to NCCH header, can be 0 or after NCSD header - u32 exefs_offset = 0; - - NCCH_Header ncch_header; - ExeFs_Header exefs_header; + bool is_exefs_loaded = false; + bool is_compressed = false; + + u32 entry_point = 0; + u32 code_size = 0; + u32 stack_size = 0; + u32 bss_size = 0; + u32 core_version = 0; + u8 priority = 0; + u8 resource_limit_category = 0; + u32 ncch_offset = 0; // Offset to NCCH header, can be 0 or after NCSD header + u32 exefs_offset = 0; + + NCCH_Header ncch_header; + ExeFs_Header exefs_header; ExHeader_Header exheader_header; - std::string filepath; + std::string filepath; }; } // namespace Loader |