diff options
author | Mai <mathew1800@gmail.com> | 2022-06-14 14:34:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-14 14:34:16 +0200 |
commit | a3b12e3809e388e9c9b0608b14d85c0985e412c3 (patch) | |
tree | 135226fe24596286c54bf9c5c4a12868c3c55e90 /src/core/file_sys | |
parent | Merge pull request #8459 from Morph1984/wextra-gcc (diff) | |
parent | kernel: fix passthrough of local captures in lambda (diff) | |
download | yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar.gz yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar.bz2 yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar.lz yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar.xz yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.tar.zst yuzu-a3b12e3809e388e9c9b0608b14d85c0985e412c3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/content_archive.cpp | 2 | ||||
-rw-r--r-- | src/core/file_sys/nca_patch.cpp | 2 | ||||
-rw-r--r-- | src/core/file_sys/registered_cache.cpp | 2 | ||||
-rw-r--r-- | src/core/file_sys/vfs_real.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/file_sys/content_archive.cpp b/src/core/file_sys/content_archive.cpp index 93f784418..78e56bbbd 100644 --- a/src/core/file_sys/content_archive.cpp +++ b/src/core/file_sys/content_archive.cpp @@ -419,7 +419,7 @@ std::optional<Core::Crypto::Key128> NCA::GetKeyAreaKey(NCASectionCryptoType type Core::Crypto::Mode::ECB); cipher.Transcode(key_area.data(), key_area.size(), key_area.data(), Core::Crypto::Op::Decrypt); - Core::Crypto::Key128 out; + Core::Crypto::Key128 out{}; if (type == NCASectionCryptoType::XTS) { std::copy(key_area.begin(), key_area.begin() + 0x10, out.begin()); } else if (type == NCASectionCryptoType::CTR || type == NCASectionCryptoType::BKTR) { diff --git a/src/core/file_sys/nca_patch.cpp b/src/core/file_sys/nca_patch.cpp index d4c0a974a..2735d053b 100644 --- a/src/core/file_sys/nca_patch.cpp +++ b/src/core/file_sys/nca_patch.cpp @@ -50,7 +50,7 @@ std::pair<std::size_t, std::size_t> SearchBucketEntry(u64 offset, const BlockTyp low = mid + 1; } } - UNREACHABLE_MSG("Offset could not be found in BKTR block."); + ASSERT_MSG(false, "Offset could not be found in BKTR block."); return {0, 0}; } } // Anonymous namespace diff --git a/src/core/file_sys/registered_cache.cpp b/src/core/file_sys/registered_cache.cpp index 2eaac73ef..878d832c2 100644 --- a/src/core/file_sys/registered_cache.cpp +++ b/src/core/file_sys/registered_cache.cpp @@ -108,7 +108,7 @@ ContentRecordType GetCRTypeFromNCAType(NCAContentType type) { // TODO(DarkLordZach): Peek at NCA contents to differentiate Manual and Legal. return ContentRecordType::HtmlDocument; default: - UNREACHABLE_MSG("Invalid NCAContentType={:02X}", type); + ASSERT_MSG(false, "Invalid NCAContentType={:02X}", type); return ContentRecordType{}; } } diff --git a/src/core/file_sys/vfs_real.cpp b/src/core/file_sys/vfs_real.cpp index e42d7c9f6..cc0076238 100644 --- a/src/core/file_sys/vfs_real.cpp +++ b/src/core/file_sys/vfs_real.cpp @@ -144,7 +144,7 @@ VirtualFile RealVfsFilesystem::MoveFile(std::string_view old_path_, std::string_ LOG_ERROR(Service_FS, "Failed to open path {} in order to re-cache it", new_path); } } else { - UNREACHABLE(); + ASSERT(false); return nullptr; } |