lux/citra
1
0
Fork 0
mirror of https://git.h3cjp.net/H3cJP/citra.git synced 2024-11-25 00:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1561 from lioncash/fs

Browse source 
file_sys: Remove unused variables
This commit is contained in:
bunnei 2018-10-24 16:28:17 -04:00 committed by GitHub
parent e65f5e4d66 c7c594a6b8
commit cdd499c261
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/core/crypto/key_manager.cpp
View file

@ -713,7 +713,6 @@ void KeyManager::DeriveBase() {
const auto sbk = GetKey(S128KeyType::SecureBoot); const auto sbk = GetKey(S128KeyType::SecureBoot);
const auto tsec = GetKey(S128KeyType::TSEC); const auto tsec = GetKey(S128KeyType::TSEC);
const auto master_source = GetKey(S128KeyType::Source, static_cast<u64>(SourceKeyType::Master));
for (size_t i = 0; i < revisions.size(); ++i) { for (size_t i = 0; i < revisions.size(); ++i) {
if (!revisions[i]) if (!revisions[i])

8
src/core/file_sys/vfs.cpp
View file

@ -472,12 +472,16 @@ bool VfsRawCopy(const VirtualFile& src, const VirtualFile& dest, std::size_t blo
std::vector<u8> temp(std::min(block_size, src->GetSize())); std::vector<u8> temp(std::min(block_size, src->GetSize()));
for (std::size_t i = 0; i < src->GetSize(); i += block_size) { for (std::size_t i = 0; i < src->GetSize(); i += block_size) {
const auto read = std::min(block_size, src->GetSize() - i); const auto read = std::min(block_size, src->GetSize() - i);
const auto block = src->Read(temp.data(), read, i);
if (dest->Write(temp.data(), read, i) != read) if (src->Read(temp.data(), read, i) != read) {
return false; return false;
} }
if (dest->Write(temp.data(), read, i) != read) {
return false;
}
}
return true; return true;
} }