From e93fbb7c5e66ff4590ce1d693cc66e7a9868a35c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 21 Oct 2020 14:58:08 -0400 Subject: DiscIO: Migrate logging over to fmt Eliminates quite a bit of the PRI* macros used for handling 64-bit values. --- Source/Core/DiscIO/DiscExtractor.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Source/Core/DiscIO/DiscExtractor.cpp') 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) { -- cgit v1.2.3