From e1a3e41bf33bf6a366760ede17c2e3bd2b106116 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 7 Jun 2017 04:16:02 -0700 Subject: fix various instances of -1 being assigned to unsigned types --- Source/Core/DiscIO/CISOBlob.h | 2 +- Source/Core/DiscIO/VolumeDirectory.cpp | 2 +- Source/Core/DiscIO/VolumeWii.cpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO') diff --git a/Source/Core/DiscIO/CISOBlob.h b/Source/Core/DiscIO/CISOBlob.h index b674dedc18..a1c8c97b40 100644 --- a/Source/Core/DiscIO/CISOBlob.h +++ b/Source/Core/DiscIO/CISOBlob.h @@ -48,7 +48,7 @@ private: CISOFileReader(File::IOFile file); typedef u16 MapType; - static const MapType UNUSED_BLOCK_ID = -1; + static const MapType UNUSED_BLOCK_ID = UINT16_MAX; File::IOFile m_file; u64 m_size; diff --git a/Source/Core/DiscIO/VolumeDirectory.cpp b/Source/Core/DiscIO/VolumeDirectory.cpp index ed965983e6..f6f603d8ff 100644 --- a/Source/Core/DiscIO/VolumeDirectory.cpp +++ b/Source/Core/DiscIO/VolumeDirectory.cpp @@ -35,7 +35,7 @@ const size_t VolumeDirectory::MAX_ID_LENGTH; VolumeDirectory::VolumeDirectory(const std::string& directory, bool is_wii, const std::string& apploader, const std::string& dol) - : m_data_start_address(-1), m_disk_header(DISKHEADERINFO_ADDRESS), + : m_data_start_address(UINT64_MAX), m_disk_header(DISKHEADERINFO_ADDRESS), m_disk_header_info(std::make_unique()), m_fst_address(0), m_dol_address(0) { m_root_directory = ExtractDirectoryName(directory); diff --git a/Source/Core/DiscIO/VolumeWii.cpp b/Source/Core/DiscIO/VolumeWii.cpp index f928bbcdf3..4b6ef56539 100644 --- a/Source/Core/DiscIO/VolumeWii.cpp +++ b/Source/Core/DiscIO/VolumeWii.cpp @@ -32,7 +32,8 @@ namespace DiscIO constexpr u64 PARTITION_DATA_OFFSET = 0x20000; VolumeWii::VolumeWii(std::unique_ptr reader) - : m_pReader(std::move(reader)), m_game_partition(PARTITION_NONE), m_last_decrypted_block(-1) + : m_pReader(std::move(reader)), m_game_partition(PARTITION_NONE), + m_last_decrypted_block(UINT64_MAX) { _assert_(m_pReader); -- cgit v1.2.3