From 7bef4701363ef7a1ae309709deec47feb232d4bd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 30 May 2018 04:05:47 -0400 Subject: VolumeGC/VolumeWii: Dehardcode sizes where applicable We can just use the relevant array to derive these sizes instead of hardcoding them directly. --- Source/Core/DiscIO/VolumeGC.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/VolumeGC.cpp') diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 4ce4c23499..f844d329c8 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -104,7 +104,7 @@ Country VolumeGC::GetCountry(const Partition& partition) const std::string VolumeGC::GetMakerID(const Partition& partition) const { char maker_id[2]; - if (!Read(0x4, 0x2, reinterpret_cast(&maker_id), partition)) + if (!Read(0x4, sizeof(maker_id), reinterpret_cast(&maker_id), partition)) return std::string(); return DecodeString(maker_id); @@ -119,7 +119,7 @@ std::optional VolumeGC::GetRevision(const Partition& partition) const std::string VolumeGC::GetInternalName(const Partition& partition) const { char name[0x60]; - if (Read(0x20, 0x60, (u8*)name, partition)) + if (Read(0x20, sizeof(name), reinterpret_cast(name), partition)) return DecodeString(name); return ""; @@ -160,7 +160,7 @@ std::vector VolumeGC::GetBanner(u32* width, u32* height) const std::string VolumeGC::GetApploaderDate(const Partition& partition) const { char date[16]; - if (!Read(0x2440, 0x10, (u8*)&date, partition)) + if (!Read(0x2440, sizeof(date), reinterpret_cast(&date), partition)) return std::string(); return DecodeString(date); -- cgit v1.2.3