diff options
| author |  Lioncash | 2018-09-19 13:45:29 -0400 |
|---|---|---|
| committer | Lioncash | 2018-09-19 14:22:30 -0400 |
| commit | 92a98a8b19ab8b6f9eefe3b2e8e80f957444d65e (patch) | |
| tree | 4f8341224d1896e408c1cbb12d429ee02f777f15 /src/core | |
| parent | Reworked incorrect nifm stubs (#1355) (diff) | |
| download | yuzu-92a98a8b19ab8b6f9eefe3b2e8e80f957444d65e.tar.gz yuzu-92a98a8b19ab8b6f9eefe3b2e8e80f957444d65e.tar.xz yuzu-92a98a8b19ab8b6f9eefe3b2e8e80f957444d65e.zip | |
xts_archive: Amend initializer order of NAX's constructor
Orders the initializer list in the same order the members would be
initialized. Avoids compiler warnings.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_sys/xts_archive.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/file_sys/xts_archive.cpp b/src/core/file_sys/xts_archive.cpp index 0173f71c1..55257da2e 100644 --- a/src/core/file_sys/xts_archive.cpp +++ b/src/core/file_sys/xts_archive.cpp | |||
| @@ -45,7 +45,7 @@ static bool CalculateHMAC256(Destination* out, const SourceKey* key, std::size_t | |||
| 45 | return true; | 45 | return true; |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | NAX::NAX(VirtualFile file_) : file(std::move(file_)), header(std::make_unique<NAXHeader>()) { | 48 | NAX::NAX(VirtualFile file_) : header(std::make_unique<NAXHeader>()), file(std::move(file_)) { |
| 49 | std::string path = FileUtil::SanitizePath(file->GetFullPath()); | 49 | std::string path = FileUtil::SanitizePath(file->GetFullPath()); |
| 50 | static const std::regex nax_path_regex("/registered/(000000[0-9A-F]{2})/([0-9A-F]{32})\\.nca", | 50 | static const std::regex nax_path_regex("/registered/(000000[0-9A-F]{2})/([0-9A-F]{32})\\.nca", |
| 51 | std::regex_constants::ECMAScript | | 51 | std::regex_constants::ECMAScript | |
| @@ -65,7 +65,7 @@ NAX::NAX(VirtualFile file_) : file(std::move(file_)), header(std::make_unique<NA | |||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | NAX::NAX(VirtualFile file_, std::array<u8, 0x10> nca_id) | 67 | NAX::NAX(VirtualFile file_, std::array<u8, 0x10> nca_id) |
| 68 | : file(std::move(file_)), header(std::make_unique<NAXHeader>()) { | 68 | : header(std::make_unique<NAXHeader>()), file(std::move(file_)) { |
| 69 | Core::Crypto::SHA256Hash hash{}; | 69 | Core::Crypto::SHA256Hash hash{}; |
| 70 | mbedtls_sha256(nca_id.data(), nca_id.size(), hash.data(), 0); | 70 | mbedtls_sha256(nca_id.data(), nca_id.size(), hash.data(), 0); |
| 71 | status = Parse(fmt::format("/registered/000000{:02X}/{}.nca", hash[0], | 71 | status = Parse(fmt::format("/registered/000000{:02X}/{}.nca", hash[0], |