summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2022-03-25 21:33:00 +0100
committerLéo Lam <leo@leolam.fr>2022-03-25 21:34:03 +0100
commit4b2c55b82b7c68ccbc63bc2c71e13f03a2db2a46 (patch)
tree23f231e04333adde16fa5253fd458cc4ccb453d9 /src
parent0e8cad1d0d9a4198c025babf2c43461d1d247ff6 (diff)
Use sead::Buffer::fill where applicable
Equivalent, shorter, more readable, and matching!
Diffstat (limited to 'src')
-rw-r--r--src/KingSystem/Resource/Actor/resResourceAS.cpp4
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASResource.cpp3
-rw-r--r--src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp3
-rw-r--r--src/KingSystem/Utils/Container/LockFreeQueue.h4
4 files changed, 4 insertions, 10 deletions
diff --git a/src/KingSystem/Resource/Actor/resResourceAS.cpp b/src/KingSystem/Resource/Actor/resResourceAS.cpp
index 2453d491..bf3edb8d 100644
--- a/src/KingSystem/Resource/Actor/resResourceAS.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceAS.cpp
@@ -18,7 +18,6 @@ AS::~AS() = default;
void AS::doCreate_(u8*, u32, sead::Heap*) {}
-// NON_MATCHING: SafeString vtable load is reordered
bool AS::parse_(u8* data, size_t size, sead::Heap* parent_heap) {
mHeap = util::tryCreateDualHeap(parent_heap);
if (!mHeap)
@@ -47,8 +46,7 @@ bool AS::parse_(u8* data, size_t size, sead::Heap* parent_heap) {
return false;
}
- for (int i = 0, n = mElementResources.size(); i < n; ++i)
- mElementResources(i) = nullptr;
+ mElementResources.fill(nullptr);
ASResource::ParseArgs args;
args.list = {};
diff --git a/src/KingSystem/Resource/Actor/resResourceASResource.cpp b/src/KingSystem/Resource/Actor/resResourceASResource.cpp
index e6b2be31..00e41a05 100644
--- a/src/KingSystem/Resource/Actor/resResourceASResource.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceASResource.cpp
@@ -228,8 +228,7 @@ bool ASResourceWithChildren::doParse(const ASResource::ParseArgs& args) {
if (!mChildren.tryAllocBuffer(size, args.heap))
return false;
- for (int i = 0, n = mChildren.size(); i < n; ++i)
- mChildren(i) = nullptr;
+ mChildren.fill(nullptr);
for (auto it = mChildren.begin(), end = mChildren.end(); it != end; ++it) {
const auto idx = *Children.getParameterData<int>(it.getIndex());
diff --git a/src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp
index 9a400cd1..c44948f1 100644
--- a/src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp
+++ b/src/KingSystem/Resource/Actor/resResourceASResourceExtension.cpp
@@ -259,8 +259,7 @@ bool ASExtensions::parse(const ASExtensions::ParseArgs& args) {
if (!mParsers.tryAllocBuffer(num_extensions, args.heap))
return false;
- for (int i = 0, n = mParsers.size(); i < n; ++i)
- mParsers(i) = nullptr;
+ mParsers.fill(nullptr);
auto it = mParsers.begin();
const auto end = mParsers.end();
diff --git a/src/KingSystem/Utils/Container/LockFreeQueue.h b/src/KingSystem/Utils/Container/LockFreeQueue.h
index 1f6d5817..28de8593 100644
--- a/src/KingSystem/Utils/Container/LockFreeQueue.h
+++ b/src/KingSystem/Utils/Container/LockFreeQueue.h
@@ -22,9 +22,7 @@ public:
void alloc(int capacity, sead::Heap* heap) {
SEAD_ASSERT(sead::Mathi::isPow2(capacity));
mBuffer.allocBufferAssert(capacity, heap);
-
- for (int i = 0, n = getCapacity(); i < n; ++i)
- mBuffer(i) = nullptr;
+ mBuffer.fill(nullptr);
}
void freeBuffer() { mBuffer.freeBuffer(); }