From 36cfcb530f6810afca93e75c47f767a453a99361 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 29 Jan 2022 05:58:31 +0100 Subject: IOFile: Make origin parameter to Seek() an enum class. --- Source/Core/DiscIO/CISOBlob.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Source/Core/DiscIO/CISOBlob.cpp') diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp index 36c6850abc..f8144eec33 100644 --- a/Source/Core/DiscIO/CISOBlob.cpp +++ b/Source/Core/DiscIO/CISOBlob.cpp @@ -18,7 +18,7 @@ CISOFileReader::CISOFileReader(File::IOFile file) : m_file(std::move(file)) m_size = m_file.GetSize(); CISOHeader header; - m_file.Seek(0, SEEK_SET); + m_file.Seek(0, File::SeekOrigin::Begin); m_file.ReadArray(&header, 1); m_block_size = header.block_size; @@ -31,8 +31,11 @@ CISOFileReader::CISOFileReader(File::IOFile file) : m_file(std::move(file)) std::unique_ptr CISOFileReader::Create(File::IOFile file) { CISOHeader header; - if (file.Seek(0, SEEK_SET) && file.ReadArray(&header, 1) && header.magic == CISO_MAGIC) + if (file.Seek(0, File::SeekOrigin::Begin) && file.ReadArray(&header, 1) && + header.magic == CISO_MAGIC) + { return std::unique_ptr(new CISOFileReader(std::move(file))); + } return nullptr; } @@ -63,7 +66,8 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) // calculate the base address u64 const file_off = CISO_HEADER_SIZE + m_ciso_map[block] * (u64)m_block_size + data_offset; - if (!(m_file.Seek(file_off, SEEK_SET) && m_file.ReadArray(out_ptr, bytes_to_read))) + if (!(m_file.Seek(file_off, File::SeekOrigin::Begin) && + m_file.ReadArray(out_ptr, bytes_to_read))) { m_file.Clear(); return false; -- cgit v1.2.3 From a336c4386c154746ef2ea732b13872f5293666be Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 29 Jan 2022 06:01:03 +0100 Subject: IOFile: Rename Clear() to ClearError() for clarity. --- Source/Core/DiscIO/CISOBlob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/DiscIO/CISOBlob.cpp') diff --git a/Source/Core/DiscIO/CISOBlob.cpp b/Source/Core/DiscIO/CISOBlob.cpp index f8144eec33..28408402b8 100644 --- a/Source/Core/DiscIO/CISOBlob.cpp +++ b/Source/Core/DiscIO/CISOBlob.cpp @@ -69,7 +69,7 @@ bool CISOFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) if (!(m_file.Seek(file_off, File::SeekOrigin::Begin) && m_file.ReadArray(out_ptr, bytes_to_read))) { - m_file.Clear(); + m_file.ClearError(); return false; } } -- cgit v1.2.3