From f907b0cb1591f11bae072fd800cd21f4c4cd41d1 Mon Sep 17 00:00:00 2001 From: lizzie Date: Fri, 1 May 2026 20:15:41 +0000 Subject: [PATCH] fix mingw errs --- .../fssystem/fssystem_aes_ctr_counter_extended_storage.cpp | 6 +++--- src/core/file_sys/fssystem/fssystem_compressed_storage.h | 6 +++--- src/core/file_sys/fssystem/fssystem_indirect_storage.cpp | 5 ++++- src/core/file_sys/fssystem/fssystem_indirect_storage.h | 5 ++++- src/core/file_sys/fssystem/fssystem_sparse_storage.cpp | 5 ++++- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp index 506624669b..e94eb2c882 100644 --- a/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp +++ b/src/core/file_sys/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project @@ -109,7 +109,7 @@ Result AesCtrCounterExtendedStorage::GetEntryList(Entry* out_entries, s32* out_e R_UNLESS(out_entries != nullptr || entry_count == 0, ResultNullptrArgument); // Check that our range is valid. - BucketTree::Offsets table_offsets; + BucketTree::Offsets table_offsets{}; R_TRY(m_table.GetOffsets(std::addressof(table_offsets))); R_UNLESS(table_offsets.IsInclude(offset, size), ResultOutOfRange); @@ -167,7 +167,7 @@ size_t AesCtrCounterExtendedStorage::Read(u8* buffer, size_t size, size_t offset ASSERT(Common::IsAligned(offset, BlockSize)); ASSERT(Common::IsAligned(size, BlockSize)); - BucketTree::Offsets table_offsets; + BucketTree::Offsets table_offsets{}; ASSERT(R_SUCCEEDED(m_table.GetOffsets(std::addressof(table_offsets)))); ASSERT(table_offsets.IsInclude(offset, size)); diff --git a/src/core/file_sys/fssystem/fssystem_compressed_storage.h b/src/core/file_sys/fssystem/fssystem_compressed_storage.h index 223d51647e..3afe898c69 100644 --- a/src/core/file_sys/fssystem/fssystem_compressed_storage.h +++ b/src/core/file_sys/fssystem/fssystem_compressed_storage.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project @@ -125,7 +125,7 @@ private: } // Get the table offsets. - BucketTree::Offsets table_offsets; + BucketTree::Offsets table_offsets{}; R_TRY(m_table.GetOffsets(std::addressof(table_offsets))); // Validate arguments. @@ -195,7 +195,7 @@ private: R_SUCCEED_IF(size == 0); // Get the table offsets. - BucketTree::Offsets table_offsets; + BucketTree::Offsets table_offsets{}; R_TRY(m_table.GetOffsets(std::addressof(table_offsets))); // Validate arguments. diff --git a/src/core/file_sys/fssystem/fssystem_indirect_storage.cpp b/src/core/file_sys/fssystem/fssystem_indirect_storage.cpp index 7544e70b2a..41f5b75b6e 100644 --- a/src/core/file_sys/fssystem/fssystem_indirect_storage.cpp +++ b/src/core/file_sys/fssystem/fssystem_indirect_storage.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -52,7 +55,7 @@ Result IndirectStorage::GetEntryList(Entry* out_entries, s32* out_entry_count, s R_UNLESS(out_entries != nullptr || entry_count == 0, ResultNullptrArgument); // Check that our range is valid. - BucketTree::Offsets table_offsets; + BucketTree::Offsets table_offsets{}; R_TRY(m_table.GetOffsets(std::addressof(table_offsets))); R_UNLESS(table_offsets.IsInclude(offset, size), ResultOutOfRange); diff --git a/src/core/file_sys/fssystem/fssystem_indirect_storage.h b/src/core/file_sys/fssystem/fssystem_indirect_storage.h index d4b95fd273..cc7b5cd718 100644 --- a/src/core/file_sys/fssystem/fssystem_indirect_storage.h +++ b/src/core/file_sys/fssystem/fssystem_indirect_storage.h @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -164,7 +167,7 @@ Result IndirectStorage::OperatePerEntry(s64 offset, s64 size, F func) { R_SUCCEED_IF(size == 0); // Get the table offsets. - BucketTree::Offsets table_offsets; + BucketTree::Offsets table_offsets{}; R_TRY(m_table.GetOffsets(std::addressof(table_offsets))); // Validate arguments. diff --git a/src/core/file_sys/fssystem/fssystem_sparse_storage.cpp b/src/core/file_sys/fssystem/fssystem_sparse_storage.cpp index 8574a11dde..31416c0c04 100644 --- a/src/core/file_sys/fssystem/fssystem_sparse_storage.cpp +++ b/src/core/file_sys/fssystem/fssystem_sparse_storage.cpp @@ -1,3 +1,6 @@ +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later @@ -18,7 +21,7 @@ size_t SparseStorage::Read(u8* buffer, size_t size, size_t offset) const { SparseStorage* self = const_cast(this); if (self->GetEntryTable().IsEmpty()) { - BucketTree::Offsets table_offsets; + BucketTree::Offsets table_offsets{}; ASSERT(R_SUCCEEDED(self->GetEntryTable().GetOffsets(std::addressof(table_offsets)))); ASSERT(table_offsets.IsInclude(offset, size));