diff options
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/CompressedBlob.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/DiscIO/DiscScrubber.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/DiscIO/FileSystemGCWii.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 04304b7613..812d9e757b 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -108,7 +108,7 @@ void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr) u32 block_hash = HashAdler32(source, comp_block_size); if (block_hash != m_hashes[block_num]) PanicAlertT("The disc image \"%s\" is corrupt.\n" - "Hash of block %" PRIu64 " is %08x instead of %08x.", + "Hash of block %llu is %08x instead of %08x.", m_file_name.c_str(), block_num, block_hash, m_hashes[block_num]); @@ -135,7 +135,7 @@ void CompressedBlobReader::GetBlock(u64 block_num, u8 *out_ptr) { // this seem to fire wrongly from time to time // to be sure, don't use compressed isos :P - PanicAlert("Failure reading block %" PRIu64 " - out of data and not at end.", block_num); + PanicAlert("Failure reading block %llu - out of data and not at end.", block_num); } inflateEnd(&z); if (uncomp_size != m_header.block_size) diff --git a/Source/Core/DiscIO/DiscScrubber.cpp b/Source/Core/DiscIO/DiscScrubber.cpp index 10d0c0e417..08ded8446c 100644 --- a/Source/Core/DiscIO/DiscScrubber.cpp +++ b/Source/Core/DiscIO/DiscScrubber.cpp @@ -130,14 +130,14 @@ size_t GetNextBlock(File::IOFile& in, u8* buffer) size_t ReadBytes = 0; if (m_isScrubbing && m_FreeTable[i]) { - DEBUG_LOG(DISCIO, "Freeing 0x%016" PRIx64, CurrentOffset); + DEBUG_LOG(DISCIO, "Freeing 0x%016llx", CurrentOffset); std::fill(buffer, buffer + m_BlockSize, 0xFF); in.Seek(m_BlockSize, SEEK_CUR); ReadBytes = m_BlockSize; } else { - DEBUG_LOG(DISCIO, "Used 0x%016" PRIx64, CurrentOffset); + DEBUG_LOG(DISCIO, "Used 0x%016llx", CurrentOffset); in.ReadArray(buffer, m_BlockSize, &ReadBytes); } @@ -161,7 +161,7 @@ void MarkAsUsed(u64 _Offset, u64 _Size) u64 CurrentOffset = _Offset; u64 EndOffset = CurrentOffset + _Size; - DEBUG_LOG(DISCIO, "Marking 0x%016" PRIx64 " - 0x%016" PRIx64 " as used", _Offset, EndOffset); + DEBUG_LOG(DISCIO, "Marking 0x%016llx - 0x%016llx as used", _Offset, EndOffset); while ((CurrentOffset < EndOffset) && (CurrentOffset < m_FileSize)) { diff --git a/Source/Core/DiscIO/FileSystemGCWii.cpp b/Source/Core/DiscIO/FileSystemGCWii.cpp index cd6f815629..8d06c3f036 100644 --- a/Source/Core/DiscIO/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/FileSystemGCWii.cpp @@ -77,7 +77,7 @@ u64 CFileSystemGCWii::ReadFile(const std::string& _rFullPath, u8* _pBuffer, u64 u64 read_length = std::min(_MaxBufferSize, pFileInfo->m_FileSize - _OffsetInFile); - DEBUG_LOG(DISCIO, "Reading %" PRIx64 " bytes at %" PRIx64 " from file %s. Offset: %" PRIx64 " Size: %" PRIx64, + DEBUG_LOG(DISCIO, "Reading %llx bytes at %llx from file %s. Offset: %llx Size: %llx", read_length, _OffsetInFile, _rFullPath.c_str(), pFileInfo->m_Offset, pFileInfo->m_FileSize); m_rVolume->Read(pFileInfo->m_Offset + _OffsetInFile, read_length, _pBuffer, m_Wii); |