diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2020-08-01 00:17:23 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2020-08-08 21:45:03 +0100 |
| commit | d2b06f47867449f112b7a782cdb626ab0f175cee (patch) | |
| tree | a37a472d347193f7caa2b49023a44da5beed29c0 /Source/Core/DiscIO | |
| parent | a161e58591cadc504c9751a563f4c065ad0f435a (diff) | |
Fix various -Wshadow warnings
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/VolumeWii.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/DiscIO/WIABlob.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp index 73797fe1e3..db31530c8e 100644 --- a/Source/Core/DiscIO/VolumeWii.cpp +++ b/Source/Core/DiscIO/VolumeWii.cpp @@ -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); diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp index cf5c7f9b65..94c3fc12c3 100644 --- a/Source/Core/DiscIO/WIABlob.cpp +++ b/Source/Core/DiscIO/WIABlob.cpp @@ -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)) |
