mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-09-25 02:38:42 +00:00
Fix various -Wshadow warnings
This commit is contained in:
parent
a161e58591
commit
d2b06f4786
10 changed files with 33 additions and 32 deletions
|
@ -571,17 +571,17 @@ bool VolumeWii::EncryptGroup(
|
|||
encryption_futures[i] = std::async(
|
||||
std::launch::async,
|
||||
[&unencrypted_data, &unencrypted_hashes, &aes_context, &out](size_t start, size_t end) {
|
||||
for (size_t i = start; i < end; ++i)
|
||||
for (size_t j = start; j < end; ++j)
|
||||
{
|
||||
u8* out_ptr = out->data() + i * BLOCK_TOTAL_SIZE;
|
||||
u8* out_ptr = out->data() + j * BLOCK_TOTAL_SIZE;
|
||||
|
||||
u8 iv[16] = {};
|
||||
mbedtls_aes_crypt_cbc(&aes_context, MBEDTLS_AES_ENCRYPT, BLOCK_HEADER_SIZE, iv,
|
||||
reinterpret_cast<u8*>(&unencrypted_hashes[i]), out_ptr);
|
||||
reinterpret_cast<u8*>(&unencrypted_hashes[j]), out_ptr);
|
||||
|
||||
std::memcpy(iv, out_ptr + 0x3D0, sizeof(iv));
|
||||
mbedtls_aes_crypt_cbc(&aes_context, MBEDTLS_AES_ENCRYPT, BLOCK_DATA_SIZE, iv,
|
||||
unencrypted_data[i].data(), out_ptr + BLOCK_HEADER_SIZE);
|
||||
unencrypted_data[j].data(), out_ptr + BLOCK_HEADER_SIZE);
|
||||
}
|
||||
},
|
||||
i * BLOCKS_PER_GROUP / threads, (i + 1) * BLOCKS_PER_GROUP / threads);
|
||||
|
|
|
@ -379,7 +379,7 @@ bool WIARVZFileReader<RVZ>::Read(u64 offset, u64 size, u8* out_ptr)
|
|||
offset - partition_data_offset, bytes_to_read, out_ptr, partition_data_offset,
|
||||
partition_total_sectors * VolumeWii::BLOCK_DATA_SIZE, partition.partition_key,
|
||||
[this, &hash_exception_error](
|
||||
VolumeWii::HashBlock hash_blocks[VolumeWii::BLOCKS_PER_GROUP], u64 offset) {
|
||||
VolumeWii::HashBlock hash_blocks[VolumeWii::BLOCKS_PER_GROUP], u64 offset_) {
|
||||
// EncryptGroups calls ReadWiiDecrypted, which calls ReadFromGroups,
|
||||
// which populates m_exception_list when m_write_to_exception_list == true
|
||||
if (!ApplyHashExceptions(m_exception_list, hash_blocks))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue