diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 9667e87fbb..5aea9d1184 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -206,7 +206,7 @@ static ConversionResult Compress(CompressThreadState* state, if (retval != Z_OK) { - ERROR_LOG(DISCIO, "Deflate failed"); + ERROR_LOG_FMT(DISCIO, "Deflate failed"); return ConversionResultCode::InternalError; } diff --git a/Source/Core/DiscIO/DirectoryBlob.cpp b/Source/Core/DiscIO/DirectoryBlob.cpp index 1e06dd74bd..9f5e6a4425 100644 --- a/Source/Core/DiscIO/DirectoryBlob.cpp +++ b/Source/Core/DiscIO/DirectoryBlob.cpp @@ -502,9 +502,9 @@ void DirectoryBlobReader::SetWiiRegionData(const std::string& game_partition_roo const std::string region_bin_path = game_partition_root + "disc/region.bin"; const size_t bytes_read = ReadFileToVector(region_bin_path, &m_wii_region_data); if (bytes_read < 0x4) - ERROR_LOG(DISCIO, "Couldn't read region from %s", region_bin_path.c_str()); + ERROR_LOG_FMT(DISCIO, "Couldn't read region from {}", region_bin_path); else if (bytes_read < 0x20) - ERROR_LOG(DISCIO, "Couldn't read age ratings from %s", region_bin_path.c_str()); + ERROR_LOG_FMT(DISCIO, "Couldn't read age ratings from {}", region_bin_path); constexpr u64 WII_REGION_DATA_ADDRESS = 0x4E000; [[maybe_unused]] constexpr u64 WII_REGION_DATA_SIZE = 0x20; @@ -644,7 +644,7 @@ void DirectoryBlobPartition::SetDiscHeaderAndDiscType(std::optional is_wii m_disc_header.resize(DISCHEADER_SIZE); const std::string boot_bin_path = m_root_directory + "sys/boot.bin"; if (ReadFileToVector(boot_bin_path, &m_disc_header) < 0x20) - ERROR_LOG(DISCIO, "%s doesn't exist or is too small", boot_bin_path.c_str()); + ERROR_LOG_FMT(DISCIO, "{} doesn't exist or is too small", boot_bin_path); m_contents.Add(DISCHEADER_ADDRESS, m_disc_header); @@ -657,7 +657,7 @@ void DirectoryBlobPartition::SetDiscHeaderAndDiscType(std::optional is_wii m_is_wii = Common::swap32(&m_disc_header[0x18]) == 0x5d1c9ea3; const bool is_gc = Common::swap32(&m_disc_header[0x1c]) == 0xc2339f3d; if (m_is_wii == is_gc) - ERROR_LOG(DISCIO, "Couldn't detect disc type based on %s", boot_bin_path.c_str()); + ERROR_LOG_FMT(DISCIO, "Couldn't detect disc type based on {}", boot_bin_path); } m_address_shift = m_is_wii ? 2 : 0; @@ -675,7 +675,7 @@ void DirectoryBlobPartition::SetBI2() const std::string bi2_path = m_root_directory + "sys/bi2.bin"; const size_t bytes_read = ReadFileToVector(bi2_path, &m_bi2); if (!m_is_wii && bytes_read < 0x1C) - ERROR_LOG(DISCIO, "Couldn't read region from %s", bi2_path.c_str()); + ERROR_LOG_FMT(DISCIO, "Couldn't read region from {}", bi2_path); m_contents.Add(BI2_ADDRESS, m_bi2); } @@ -689,14 +689,14 @@ u64 DirectoryBlobPartition::SetApploader() m_apploader.resize(file.GetSize()); if (m_apploader.size() < 0x20 || !file.ReadBytes(m_apploader.data(), m_apploader.size())) { - ERROR_LOG(DISCIO, "%s couldn't be accessed or is too small", path.c_str()); + ERROR_LOG_FMT(DISCIO, "{} couldn't be accessed or is too small", path); } else { const size_t apploader_size = 0x20 + Common::swap32(*(u32*)&m_apploader[0x14]) + Common::swap32(*(u32*)&m_apploader[0x18]); if (apploader_size != m_apploader.size()) - ERROR_LOG(DISCIO, "%s is the wrong size... Is it really an apploader?", path.c_str()); + ERROR_LOG_FMT(DISCIO, "{} is the wrong size... Is it really an apploader?", path); else success = true; } diff --git a/Source/Core/DiscIO/DiscExtractor.cpp b/Source/Core/DiscIO/DiscExtractor.cpp index c9b01759a1..a68093aca9 100644 --- a/Source/Core/DiscIO/DiscExtractor.cpp +++ b/Source/Core/DiscIO/DiscExtractor.cpp @@ -5,7 +5,6 @@ #include "DiscIO/DiscExtractor.h" #include -#include #include #include @@ -58,11 +57,9 @@ u64 ReadFile(const Volume& volume, const Partition& partition, const FileInfo* f const u64 read_length = std::min(max_buffer_size, file_info->GetSize() - offset_in_file); - DEBUG_LOG(DISCIO, - "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 - " Size: %" PRIx32, - read_length, offset_in_file, file_info->GetPath().c_str(), file_info->GetOffset(), - file_info->GetSize()); + DEBUG_LOG_FMT(DISCIO, "Reading {:x} bytes at {:x} from file {}. Offset: {:x} Size: {:x}", + read_length, offset_in_file, file_info->GetPath(), file_info->GetOffset(), + file_info->GetSize()); if (!volume.Read(file_info->GetOffset() + offset_in_file, read_length, buffer, partition)) return 0; @@ -144,14 +141,14 @@ void ExportDirectory(const Volume& volume, const Partition& partition, const Fil if (update_progress(path)) return; - DEBUG_LOG(DISCIO, "%s", export_path.c_str()); + DEBUG_LOG_FMT(DISCIO, "{}", export_path); if (!file_info.IsDirectory()) { if (File::Exists(export_path)) - NOTICE_LOG(DISCIO, "%s already exists", export_path.c_str()); + NOTICE_LOG_FMT(DISCIO, "{} already exists", export_path); else if (!ExportFile(volume, partition, &file_info, export_path)) - ERROR_LOG(DISCIO, "Could not export %s", export_path.c_str()); + ERROR_LOG_FMT(DISCIO, "Could not export {}", export_path); } else if (recursive) { diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index e7b098b374..bd39e8bb7a 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -5,9 +5,7 @@ #include "DiscIO/DiscScrubber.h" #include -#include #include -#include #include #include #include @@ -16,7 +14,6 @@ #include "Common/Align.h" #include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/Logging/Log.h" #include "DiscIO/DiscExtractor.h" @@ -59,7 +56,7 @@ void DiscScrubber::MarkAsUsed(u64 offset, u64 size) u64 current_offset = Common::AlignDown(offset, CLUSTER_SIZE); const u64 end_offset = offset + size; - DEBUG_LOG(DISCIO, "Marking 0x%016" PRIx64 " - 0x%016" PRIx64 " as used", offset, end_offset); + DEBUG_LOG_FMT(DISCIO, "Marking {:#018x} - {:#018x} as used", offset, end_offset); while (current_offset < end_offset && current_offset < m_file_size) { @@ -165,8 +162,8 @@ bool DiscScrubber::ParsePartitionData(const Partition& partition) const FileSystem* filesystem = m_disc->GetFileSystem(partition); if (!filesystem) { - ERROR_LOG(DISCIO, "Failed to read file system for the partition at 0x%" PRIx64, - partition.offset); + ERROR_LOG_FMT(DISCIO, "Failed to read file system for the partition at {:#x}", + partition.offset); return false; } @@ -221,7 +218,7 @@ void DiscScrubber::ParseFileSystemData(u64 partition_data_offset, const FileInfo { for (const DiscIO::FileInfo& file_info : directory) { - DEBUG_LOG(DISCIO, "Scrubbing %s", file_info.GetPath().c_str()); + DEBUG_LOG_FMT(DISCIO, "Scrubbing {}", file_info.GetPath()); if (file_info.IsDirectory()) ParseFileSystemData(partition_data_offset, file_info); else diff --git a/Source/Core/DiscIO/DriveBlob.cpp b/Source/Core/DiscIO/DriveBlob.cpp index e31bae1ea2..5aab7b22f8 100644 --- a/Source/Core/DiscIO/DriveBlob.cpp +++ b/Source/Core/DiscIO/DriveBlob.cpp @@ -98,7 +98,7 @@ DriveReader::DriveReader(const std::string& drive) } else { - NOTICE_LOG(DISCIO, "Load from DVD backup failed or no disc in drive %s", drive.c_str()); + NOTICE_LOG_FMT(DISCIO, "Load from DVD backup failed or no disc in drive {}", drive); } } diff --git a/Source/Core/DiscIO/Enums.cpp b/Source/Core/DiscIO/Enums.cpp index a97b6fc34f..c43132b7f2 100644 --- a/Source/Core/DiscIO/Enums.cpp +++ b/Source/Core/DiscIO/Enums.cpp @@ -324,7 +324,7 @@ Country CountryCodeToCountry(u8 country_code, Platform platform, Region region, default: if (country_code > 'A') // Silently ignore IOS wads - WARN_LOG(DISCIO, "Unknown Country Code! %c", country_code); + WARN_LOG_FMT(DISCIO, "Unknown Country Code! {}", static_cast(country_code)); return Country::Unknown; } } @@ -366,7 +366,7 @@ std::string GetSysMenuVersionString(u16 title_version) region_letter = 'K'; break; case Region::Unknown: - WARN_LOG(DISCIO, "Unknown region for Wii Menu version %u", title_version); + WARN_LOG_FMT(DISCIO, "Unknown region for Wii Menu version {}", title_version); break; } diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index 7e3b3452b9..71e7fb7ff3 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -187,7 +187,7 @@ bool FileInfoGCWii::IsValid(u64 fst_size, const FileInfoGCWii& parent_directory) { if (GetNameOffset() >= fst_size) { - ERROR_LOG(DISCIO, "Impossibly large name offset in file system"); + ERROR_LOG_FMT(DISCIO, "Impossibly large name offset in file system"); return false; } @@ -195,21 +195,21 @@ bool FileInfoGCWii::IsValid(u64 fst_size, const FileInfoGCWii& parent_directory) { if (Get(EntryProperty::FILE_OFFSET) != parent_directory.m_index) { - ERROR_LOG(DISCIO, "Incorrect parent offset in file system"); + ERROR_LOG_FMT(DISCIO, "Incorrect parent offset in file system"); return false; } - u32 size = Get(EntryProperty::FILE_SIZE); + const u32 size = Get(EntryProperty::FILE_SIZE); if (size <= m_index) { - ERROR_LOG(DISCIO, "Impossibly small directory size in file system"); + ERROR_LOG_FMT(DISCIO, "Impossibly small directory size in file system"); return false; } if (size > parent_directory.Get(EntryProperty::FILE_SIZE)) { - ERROR_LOG(DISCIO, "Impossibly large directory size in file system"); + ERROR_LOG_FMT(DISCIO, "Impossibly large directory size in file system"); return false; } @@ -241,7 +241,7 @@ FileSystemGCWii::FileSystemGCWii(const VolumeDisc* volume, const Partition& part return; if (*fst_size < FST_ENTRY_SIZE) { - ERROR_LOG(DISCIO, "File system is too small"); + ERROR_LOG_FMT(DISCIO, "File system is too small"); return; } @@ -253,7 +253,7 @@ FileSystemGCWii::FileSystemGCWii(const VolumeDisc* volume, const Partition& part // Without this check, Dolphin can crash by trying to allocate too much // memory when loading a disc image with an incorrect FST size. - ERROR_LOG(DISCIO, "File system is abnormally large! Aborting loading"); + ERROR_LOG_FMT(DISCIO, "File system is abnormally large! Aborting loading"); return; } @@ -261,7 +261,7 @@ FileSystemGCWii::FileSystemGCWii(const VolumeDisc* volume, const Partition& part m_file_system_table.resize(*fst_size); if (!volume->Read(*fst_offset, *fst_size, m_file_system_table.data(), partition)) { - ERROR_LOG(DISCIO, "Couldn't read file system table"); + ERROR_LOG_FMT(DISCIO, "Couldn't read file system table"); return; } @@ -269,20 +269,20 @@ FileSystemGCWii::FileSystemGCWii(const VolumeDisc* volume, const Partition& part m_root = FileInfoGCWii(m_file_system_table.data(), offset_shift); if (!m_root.IsDirectory()) { - ERROR_LOG(DISCIO, "File system root is not a directory"); + ERROR_LOG_FMT(DISCIO, "File system root is not a directory"); return; } if (FST_ENTRY_SIZE * m_root.GetSize() > *fst_size) { - ERROR_LOG(DISCIO, "File system has too many entries for its size"); + ERROR_LOG_FMT(DISCIO, "File system has too many entries for its size"); return; } // If the FST's final byte isn't 0, FileInfoGCWii::GetName() can read past the end if (m_file_system_table[*fst_size - 1] != 0) { - ERROR_LOG(DISCIO, "File system does not end with a null byte"); + ERROR_LOG_FMT(DISCIO, "File system does not end with a null byte"); return; } diff --git a/Source/Core/DiscIO/NANDImporter.cpp b/Source/Core/DiscIO/NANDImporter.cpp index beb84e8357..5bd651be2e 100644 --- a/Source/Core/DiscIO/NANDImporter.cpp +++ b/Source/Core/DiscIO/NANDImporter.cpp @@ -105,8 +105,8 @@ void NANDImporter::FindSuperblock() { if (!memcmp(m_nand.data() + pos, "SFFS", 4)) { - u32 version = Common::swap32(&m_nand[pos + 4]); - INFO_LOG(DISCIO, "Found superblock at 0x%zx with version 0x%x", pos, version); + const u32 version = Common::swap32(&m_nand[pos + 4]); + INFO_LOG_FMT(DISCIO, "Found superblock at {:#x} with version {:#x}", pos, version); if (superblock == 0 || version > newest_version) { superblock = pos; @@ -117,8 +117,9 @@ void NANDImporter::FindSuperblock() m_nand_fat_offset = superblock + 0xC; m_nand_fst_offset = m_nand_fat_offset + 0x10000; - INFO_LOG(DISCIO, "Using superblock version 0x%x at position 0x%zx. FAT/FST offset: 0x%zx/0x%zx", - newest_version, superblock, m_nand_fat_offset, m_nand_fst_offset); + INFO_LOG_FMT(DISCIO, + "Using superblock version {:#x} at position {:#x}. FAT/FST offset: {:#x}/{:#x}", + newest_version, superblock, m_nand_fat_offset, m_nand_fst_offset); } std::string NANDImporter::GetPath(const NANDFSTEntry& entry, const std::string& parent_path) @@ -153,13 +154,13 @@ void NANDImporter::ProcessEntry(u16 entry_number, const std::string& parent_path else if ((entry.mode & 3) == 2) ProcessDirectory(entry, parent_path); else - ERROR_LOG(DISCIO, "Unknown mode: %s", FormatDebugString(entry).c_str()); + ERROR_LOG_FMT(DISCIO, "Unknown mode: {}", FormatDebugString(entry)); } void NANDImporter::ProcessDirectory(const NANDFSTEntry& entry, const std::string& parent_path) { m_update_callback(); - INFO_LOG(DISCIO, "Path: %s", FormatDebugString(entry).c_str()); + INFO_LOG_FMT(DISCIO, "Path: {}", FormatDebugString(entry)); const std::string path = GetPath(entry, parent_path); File::CreateDir(path); @@ -167,7 +168,7 @@ void NANDImporter::ProcessDirectory(const NANDFSTEntry& entry, const std::string if (entry.sub != 0xffff) ProcessEntry(entry.sub, path); - INFO_LOG(DISCIO, "Path: %s", parent_path.c_str() + m_nand_root_length); + INFO_LOG_FMT(DISCIO, "Path: {}", parent_path.data() + m_nand_root_length); } void NANDImporter::ProcessFile(const NANDFSTEntry& entry, const std::string& parent_path) @@ -176,7 +177,7 @@ void NANDImporter::ProcessFile(const NANDFSTEntry& entry, const std::string& par constexpr size_t NAND_FAT_BLOCK_SIZE = 0x4000; m_update_callback(); - INFO_LOG(DISCIO, "File: %s", FormatDebugString(entry).c_str()); + INFO_LOG_FMT(DISCIO, "File: {}", FormatDebugString(entry)); const std::string path = GetPath(entry, parent_path); File::IOFile file(path, "wb"); @@ -206,7 +207,7 @@ bool NANDImporter::ExtractCertificates(const std::string& nand_root) std::vector tmd_bytes(tmd_file.GetSize()); if (!tmd_file.ReadBytes(tmd_bytes.data(), tmd_bytes.size())) { - ERROR_LOG(DISCIO, "ExtractCertificates: Could not read IOS13 TMD"); + ERROR_LOG_FMT(DISCIO, "ExtractCertificates: Could not read IOS13 TMD"); return false; } @@ -214,7 +215,7 @@ bool NANDImporter::ExtractCertificates(const std::string& nand_root) IOS::ES::Content content_metadata; if (!tmd.GetContent(tmd.GetBootIndex(), &content_metadata)) { - ERROR_LOG(DISCIO, "ExtractCertificates: Could not get content ID from TMD"); + ERROR_LOG_FMT(DISCIO, "ExtractCertificates: Could not get content ID from TMD"); return false; } @@ -222,17 +223,17 @@ bool NANDImporter::ExtractCertificates(const std::string& nand_root) std::vector content_bytes(content_file.GetSize()); if (!content_file.ReadBytes(content_bytes.data(), content_bytes.size())) { - ERROR_LOG(DISCIO, "ExtractCertificates: Could not read IOS13 contents"); + ERROR_LOG_FMT(DISCIO, "ExtractCertificates: Could not read IOS13 contents"); return false; } struct PEMCertificate { - std::string filename; + std::string_view filename; std::array search_bytes; }; - std::array certificates = {{ + static constexpr std::array certificates{{ {"/clientca.pem", {{0x30, 0x82, 0x03, 0xE9}}}, {"/clientcakey.pem", {{0x30, 0x82, 0x02, 0x5D}}}, {"/rootca.pem", {{0x30, 0x82, 0x03, 0x7D}}}, @@ -246,21 +247,21 @@ bool NANDImporter::ExtractCertificates(const std::string& nand_root) if (search_result == content_bytes.end()) { - ERROR_LOG(DISCIO, "ExtractCertificates: Could not find offset for certficate '%s'", - certificate.filename.c_str()); + ERROR_LOG_FMT(DISCIO, "ExtractCertificates: Could not find offset for certficate '{}'", + certificate.filename); return false; } - const std::string pem_file_path = nand_root + certificate.filename; + const std::string pem_file_path = nand_root + std::string(certificate.filename); const ptrdiff_t certificate_offset = std::distance(content_bytes.begin(), search_result); const u16 certificate_size = Common::swap16(&content_bytes[certificate_offset - 2]); - INFO_LOG(DISCIO, "ExtractCertificates: '%s' offset: 0x%tx size: 0x%x", - certificate.filename.c_str(), certificate_offset, certificate_size); + INFO_LOG_FMT(DISCIO, "ExtractCertificates: '{}' offset: {:#x} size: {:#x}", + certificate.filename, certificate_offset, certificate_size); File::IOFile pem_file(pem_file_path, "wb"); if (!pem_file.WriteBytes(&content_bytes[certificate_offset], certificate_size)) { - ERROR_LOG(DISCIO, "ExtractCertificates: Unable to write to file %s", pem_file_path.c_str()); + ERROR_LOG_FMT(DISCIO, "ExtractCertificates: Unable to write to file {}", pem_file_path); return false; } } diff --git a/Source/Core/DiscIO/VolumeGC.cpp b/Source/Core/DiscIO/VolumeGC.cpp index 3489965395..e8bab67771 100644 --- a/Source/Core/DiscIO/VolumeGC.cpp +++ b/Source/Core/DiscIO/VolumeGC.cpp @@ -2,7 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include +#include "DiscIO/VolumeGC.h" + #include #include #include @@ -26,7 +27,6 @@ #include "DiscIO/FileSystemGCWii.h" #include "DiscIO/Filesystem.h" #include "DiscIO/Volume.h" -#include "DiscIO/VolumeGC.h" namespace DiscIO { @@ -159,7 +159,7 @@ VolumeGC::ConvertedGCBanner VolumeGC::LoadBannerFile() const reinterpret_cast(&banner_file), sizeof(GCBanner)); if (file_size < 4) { - WARN_LOG(DISCIO, "Could not read opening.bnr."); + WARN_LOG_FMT(DISCIO, "Could not read opening.bnr."); return {}; // Return early so that we don't access the uninitialized banner_file.id } @@ -176,7 +176,8 @@ VolumeGC::ConvertedGCBanner VolumeGC::LoadBannerFile() const } else { - WARN_LOG(DISCIO, "Invalid opening.bnr. Type: %0x Size: %0" PRIx64, banner_file.id, file_size); + WARN_LOG_FMT(DISCIO, "Invalid opening.bnr. Type: {:#0x} Size: {:#0x}", banner_file.id, + file_size); return {}; } diff --git a/Source/Core/DiscIO/VolumeVerifier.cpp b/Source/Core/DiscIO/VolumeVerifier.cpp index f626250ca5..8ba1644fa5 100644 --- a/Source/Core/DiscIO/VolumeVerifier.cpp +++ b/Source/Core/DiscIO/VolumeVerifier.cpp @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -97,7 +96,7 @@ void RedumpVerifier::Start(const Volume& volume) switch (download_state->status) { case DownloadStatus::FailButOldCacheAvailable: - ERROR_LOG(DISCIO, "Failed to fetch data from Redump.org, using old cached data instead"); + ERROR_LOG_FMT(DISCIO, "Failed to fetch data from Redump.org, using old cached data instead"); [[fallthrough]]; case DownloadStatus::Success: return ScanDatfile(ReadDatfile(system), system); @@ -156,7 +155,7 @@ RedumpVerifier::DownloadStatus RedumpVerifier::DownloadDatfile(const std::string File::CreateFullPath(output_path); if (!File::IOFile(output_path, "wb").WriteBytes(result->data(), result->size())) - ERROR_LOG(DISCIO, "Failed to write downloaded datfile to %s", output_path.c_str()); + ERROR_LOG_FMT(DISCIO, "Failed to write downloaded datfile to {}", output_path); return DownloadStatus::Success; } @@ -275,7 +274,7 @@ std::vector RedumpVerifier::ScanDatfile(const st if (game_id_start == std::string::npos || serial.size() < game_id_start + 4) { - ERROR_LOG(DISCIO, "Invalid serial in redump datfile: %s", serial_str.c_str()); + ERROR_LOG_FMT(DISCIO, "Invalid serial in redump datfile: {}", serial_str); continue; } @@ -1167,8 +1166,7 @@ void VolumeVerifier::Process() if (!read_succeeded) { - ERROR_LOG(DISCIO, "Read failed at 0x%" PRIx64 " to 0x%" PRIx64, m_progress, - m_progress + bytes_to_read); + ERROR_LOG_FMT(DISCIO, "Read failed at {:#x} to {:#x}", m_progress, m_progress + bytes_to_read); m_read_errors_occurred = true; m_calculating_any_hash = false; @@ -1245,12 +1243,12 @@ void VolumeVerifier::Process() { if (m_scrubber.CanBlockBeScrubbed(offset)) { - WARN_LOG(DISCIO, "Integrity check failed for unused block at 0x%" PRIx64, offset); + WARN_LOG_FMT(DISCIO, "Integrity check failed for unused block at {:#x}", offset); m_unused_block_errors[m_blocks[block_index].partition]++; } else { - WARN_LOG(DISCIO, "Integrity check failed for block at 0x%" PRIx64, offset); + WARN_LOG_FMT(DISCIO, "Integrity check failed for block at {:#x}", offset); m_block_errors[m_blocks[block_index].partition]++; } } diff --git a/Source/Core/DiscIO/VolumeWad.cpp b/Source/Core/DiscIO/VolumeWad.cpp index 86aebb20b6..e32609476f 100644 --- a/Source/Core/DiscIO/VolumeWad.cpp +++ b/Source/Core/DiscIO/VolumeWad.cpp @@ -54,7 +54,7 @@ VolumeWAD::VolumeWAD(std::unique_ptr reader) : m_reader(std::move(re if (!IOS::ES::IsValidTMDSize(m_tmd_size)) { - ERROR_LOG(DISCIO, "TMD is too large: %u bytes", m_tmd_size); + ERROR_LOG_FMT(DISCIO, "TMD is too large: {} bytes", m_tmd_size); return; } @@ -240,7 +240,8 @@ IOS::ES::TicketReader VolumeWAD::GetTicketWithFixedCommonKey() const } } - ERROR_LOG(DISCIO, "Couldn't find valid common key for WAD file (%u specified)", specified_index); + ERROR_LOG_FMT(DISCIO, "Couldn't find valid common key for WAD file ({} specified)", + specified_index); return m_ticket; } diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp index 8b309267d1..28fc4752c1 100644 --- a/Source/Core/DiscIO/WIABlob.cpp +++ b/Source/Core/DiscIO/WIABlob.cpp @@ -6,7 +6,6 @@ #include #include -#include #include #include #include @@ -104,8 +103,7 @@ bool WIARVZFileReader::Initialize(const std::string& path) if (version < file_version_compatible || version_read_compatible > file_version) { - ERROR_LOG(DISCIO, "Unsupported version %s in %s", VersionToString(file_version).c_str(), - path.c_str()); + ERROR_LOG_FMT(DISCIO, "Unsupported version {} in {}", VersionToString(file_version), path); return false; } @@ -117,7 +115,7 @@ bool WIARVZFileReader::Initialize(const std::string& path) if (Common::swap64(m_header_1.wia_file_size) != m_file.GetSize()) { - ERROR_LOG(DISCIO, "File size is incorrect for %s", path.c_str()); + ERROR_LOG_FMT(DISCIO, "File size is incorrect for {}", path); return false; } @@ -156,7 +154,7 @@ bool WIARVZFileReader::Initialize(const std::string& path) if (m_compression_type > (RVZ ? WIARVZCompressionType::Zstd : WIARVZCompressionType::LZMA2) || (RVZ && m_compression_type == WIARVZCompressionType::Purge)) { - ERROR_LOG(DISCIO, "Unsupported compression type %u in %s", compression_type, path.c_str()); + ERROR_LOG_FMT(DISCIO, "Unsupported compression type {} in {}", compression_type, path); return false; } @@ -785,7 +783,7 @@ bool WIARVZFileReader::Chunk::HandleExceptions(const u8* data, size_t bytes { if (sizeof(u16) + *bytes_used > bytes_allocated) { - ERROR_LOG(DISCIO, "More hash exceptions than expected"); + ERROR_LOG_FMT(DISCIO, "More hash exceptions than expected"); return false; } if (sizeof(u16) + *bytes_used > bytes_written) @@ -799,7 +797,7 @@ bool WIARVZFileReader::Chunk::HandleExceptions(const u8* data, size_t bytes if (exception_list_size + *bytes_used > bytes_allocated) { - ERROR_LOG(DISCIO, "More hash exceptions than expected"); + ERROR_LOG_FMT(DISCIO, "More hash exceptions than expected"); return false; } if (exception_list_size + *bytes_used > bytes_written) @@ -950,17 +948,17 @@ ConversionResultCode WIARVZFileReader::SetUpDataEntriesForWriting( if (partition.offset < last_partition_end_offset) { - WARN_LOG(DISCIO, "Overlapping partitions at %" PRIx64, partition.offset); + WARN_LOG_FMT(DISCIO, "Overlapping partitions at {:x}", partition.offset); continue; } - if (volume->ReadSwapped(partition.offset, PARTITION_NONE) != u32(0x10001)) + if (volume->ReadSwapped(partition.offset, PARTITION_NONE) != 0x10001U) { // This looks more like garbage data than an actual partition. // The values of data_offset and data_size will very likely also be garbage. // Some WBFS writing programs scrub the SSBB Masterpiece partitions without // removing them from the partition table, causing this problem. - WARN_LOG(DISCIO, "Invalid partition at %" PRIx64, partition.offset); + WARN_LOG_FMT(DISCIO, "Invalid partition at {:x}", partition.offset); continue; } @@ -977,19 +975,19 @@ ConversionResultCode WIARVZFileReader::SetUpDataEntriesForWriting( if (data_start % VolumeWii::BLOCK_TOTAL_SIZE != 0) { - WARN_LOG(DISCIO, "Misaligned partition at %" PRIx64, partition.offset); + WARN_LOG_FMT(DISCIO, "Misaligned partition at {:x}", partition.offset); continue; } if (*data_size < VolumeWii::BLOCK_TOTAL_SIZE) { - WARN_LOG(DISCIO, "Very small partition at %" PRIx64, partition.offset); + WARN_LOG_FMT(DISCIO, "Very small partition at {:x}", partition.offset); continue; } if (data_end > iso_size) { - WARN_LOG(DISCIO, "Too large partition at %" PRIx64, partition.offset); + WARN_LOG_FMT(DISCIO, "Too large partition at {:x}", partition.offset); *data_size = iso_size - *data_offset - partition.offset; } @@ -1711,7 +1709,8 @@ bool WIARVZFileReader::WriteHeader(File::IOFile* file, const u8* data, size // is past the upper bound, we are already at the end of the file, so we don't need to do anything if (*bytes_written <= upper_bound && *bytes_written + size > upper_bound) { - WARN_LOG(DISCIO, "Headers did not fit in the allocated space. Writing to end of file instead"); + WARN_LOG_FMT(DISCIO, + "Headers did not fit in the allocated space. Writing to end of file instead"); if (!file->Seek(0, SEEK_END)) return false; *bytes_written = file->Tell();