diff options
| author | 2020-10-15 14:49:45 -0400 | |
|---|---|---|
| committer | 2020-10-17 19:50:39 -0400 | |
| commit | be1954e04cb5a0c3a526f78ed5490a5e65310280 (patch) | |
| tree | 267db7ae4be88dbbc288fa605e35d4a2a13839f6 /src/core/crypto/key_manager.cpp | |
| parent | Merge pull request #4787 from lioncash/conversion (diff) | |
| download | yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.gz yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.tar.xz yuzu-be1954e04cb5a0c3a526f78ed5490a5e65310280.zip | |
core: Fix clang build
Recent changes to the build system that made more warnings be flagged as
errors caused building via clang to break.
Fixes #4795
Diffstat (limited to 'src/core/crypto/key_manager.cpp')
| -rw-r--r-- | src/core/crypto/key_manager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/crypto/key_manager.cpp b/src/core/crypto/key_manager.cpp index da15f764a..1f0d3170b 100644 --- a/src/core/crypto/key_manager.cpp +++ b/src/core/crypto/key_manager.cpp | |||
| @@ -143,6 +143,7 @@ u64 GetSignatureTypeDataSize(SignatureType type) { | |||
| 143 | return 0x3C; | 143 | return 0x3C; |
| 144 | } | 144 | } |
| 145 | UNREACHABLE(); | 145 | UNREACHABLE(); |
| 146 | return 0; | ||
| 146 | } | 147 | } |
| 147 | 148 | ||
| 148 | u64 GetSignatureTypePaddingSize(SignatureType type) { | 149 | u64 GetSignatureTypePaddingSize(SignatureType type) { |
| @@ -157,6 +158,7 @@ u64 GetSignatureTypePaddingSize(SignatureType type) { | |||
| 157 | return 0x40; | 158 | return 0x40; |
| 158 | } | 159 | } |
| 159 | UNREACHABLE(); | 160 | UNREACHABLE(); |
| 161 | return 0; | ||
| 160 | } | 162 | } |
| 161 | 163 | ||
| 162 | SignatureType Ticket::GetSignatureType() const { | 164 | SignatureType Ticket::GetSignatureType() const { |
| @@ -171,6 +173,7 @@ SignatureType Ticket::GetSignatureType() const { | |||
| 171 | } | 173 | } |
| 172 | 174 | ||
| 173 | UNREACHABLE(); | 175 | UNREACHABLE(); |
| 176 | return {}; | ||
| 174 | } | 177 | } |
| 175 | 178 | ||
| 176 | TicketData& Ticket::GetData() { | 179 | TicketData& Ticket::GetData() { |
| @@ -348,7 +351,7 @@ std::optional<Key128> DeriveSDSeed() { | |||
| 348 | std::array<u8, 0x10> buffer{}; | 351 | std::array<u8, 0x10> buffer{}; |
| 349 | std::size_t offset = 0; | 352 | std::size_t offset = 0; |
| 350 | for (; offset + 0x10 < save_43.GetSize(); ++offset) { | 353 | for (; offset + 0x10 < save_43.GetSize(); ++offset) { |
| 351 | if (!save_43.Seek(offset, SEEK_SET)) { | 354 | if (!save_43.Seek(static_cast<s64>(offset), SEEK_SET)) { |
| 352 | return std::nullopt; | 355 | return std::nullopt; |
| 353 | } | 356 | } |
| 354 | 357 | ||
| @@ -358,7 +361,7 @@ std::optional<Key128> DeriveSDSeed() { | |||
| 358 | } | 361 | } |
| 359 | } | 362 | } |
| 360 | 363 | ||
| 361 | if (!save_43.Seek(offset + 0x10, SEEK_SET)) { | 364 | if (!save_43.Seek(static_cast<s64>(offset + 0x10), SEEK_SET)) { |
| 362 | return std::nullopt; | 365 | return std::nullopt; |
| 363 | } | 366 | } |
| 364 | 367 | ||