summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/DiscExtractor.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2020-10-21 14:58:08 -0400
committerLioncash <mathew1800@gmail.com>2020-10-22 15:41:42 -0400
commite93fbb7c5e66ff4590ce1d693cc66e7a9868a35c (patch)
tree7e6d9219301ec08798fe3cf6b74e27a78105e35b /Source/Core/DiscIO/DiscExtractor.cpp
parent09e87b79f19ce0fb06b236e15ebed414af57558a (diff)
DiscIO: Migrate logging over to fmt
Eliminates quite a bit of the PRI* macros used for handling 64-bit values.
Diffstat (limited to 'Source/Core/DiscIO/DiscExtractor.cpp')
-rw-r--r--Source/Core/DiscIO/DiscExtractor.cpp15
1 files changed, 6 insertions, 9 deletions
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 <algorithm>
-#include <cinttypes>
#include <locale>
#include <optional>
@@ -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)
{