From 50eee9b2185c59c32fb82cf464230a058edd10ea Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 12 Aug 2023 15:18:55 -0400 Subject: fssystem: rework for yuzu style --- src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h') diff --git a/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h b/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h index 27d34fd17..f96691d03 100644 --- a/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h +++ b/src/core/file_sys/fssystem/fssystem_alignment_matching_storage.h @@ -34,7 +34,7 @@ public: virtual size_t Read(u8* buffer, size_t size, size_t offset) const override { // Allocate a work buffer on stack. - alignas(DataAlignMax) char work_buf[DataAlign]; + alignas(DataAlignMax) std::array work_buf; // Succeed if zero size. if (size == 0) { @@ -47,13 +47,13 @@ public: s64 bs_size = this->GetSize(); ASSERT(R_SUCCEEDED(IStorage::CheckAccessRange(offset, size, bs_size))); - return AlignmentMatchingStorageImpl::Read(m_base_storage, work_buf, sizeof(work_buf), + return AlignmentMatchingStorageImpl::Read(m_base_storage, work_buf.data(), work_buf.size(), DataAlign, BufferAlign, offset, buffer, size); } virtual size_t Write(const u8* buffer, size_t size, size_t offset) override { // Allocate a work buffer on stack. - alignas(DataAlignMax) char work_buf[DataAlign]; + alignas(DataAlignMax) std::array work_buf; // Succeed if zero size. if (size == 0) { @@ -66,7 +66,7 @@ public: s64 bs_size = this->GetSize(); ASSERT(R_SUCCEEDED(IStorage::CheckAccessRange(offset, size, bs_size))); - return AlignmentMatchingStorageImpl::Write(m_base_storage, work_buf, sizeof(work_buf), + return AlignmentMatchingStorageImpl::Write(m_base_storage, work_buf.data(), work_buf.size(), DataAlign, BufferAlign, offset, buffer, size); } -- cgit v1.2.3