diff options
| author | Léo Lam <leo@leolam.fr> | 2020-10-22 22:07:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-22 22:07:53 +0200 |
| commit | 64f7a4448b3071a0419dc09125e2cdf73cb99b97 (patch) | |
| tree | 03038d72a1b89159c4e0138c75a61c8a75eeec22 /Source/Core/DiscIO/DiscScrubber.cpp | |
| parent | 98b7814139490fb0267a7e5dd846f0e5cabcc79c (diff) | |
| parent | e93fbb7c5e66ff4590ce1d693cc66e7a9868a35c (diff) | |
Merge pull request #9178 from lioncash/disclog
DiscIO: Migrate logging over to fmt
Diffstat (limited to 'Source/Core/DiscIO/DiscScrubber.cpp')
| -rw-r--r-- | Source/Core/DiscIO/DiscScrubber.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
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 <algorithm> -#include <cinttypes> #include <cstddef> -#include <cstdio> #include <memory> #include <optional> #include <string> @@ -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 |