From 47d903f4ac0abf1e0eae4683c2b0632a522b0b84 Mon Sep 17 00:00:00 2001 From: Adam Heinermann Date: Tue, 7 Oct 2025 02:52:35 -0700 Subject: [PATCH] chore(memory): remove single arg SMemFree --- storm/Memory.cpp | 6 ------ storm/Memory.hpp | 2 -- storm/thread/linux/S_Thread.cpp | 2 +- storm/thread/mac/S_Thread.mm | 2 +- storm/thread/win/S_Thread.cpp | 2 +- test/Memory.cpp | 24 +++++++++--------------- test/String.cpp | 4 ++-- 7 files changed, 14 insertions(+), 28 deletions(-) diff --git a/storm/Memory.cpp b/storm/Memory.cpp index b0679cb..26a089f 100644 --- a/storm/Memory.cpp +++ b/storm/Memory.cpp @@ -51,12 +51,6 @@ void STORMAPI SMemFill(void* ptr, size_t bytes, uint8_t value) { memset(ptr, value, bytes); } -void STORMAPI SMemFree(void* ptr) { - if (ptr) { - free(ptr); - } -} - void STORMAPI SMemFree(void* ptr, const char* filename, int32_t linenumber, uint32_t flags) { if (ptr) { free(ptr); diff --git a/storm/Memory.hpp b/storm/Memory.hpp index d532c69..698ad53 100644 --- a/storm/Memory.hpp +++ b/storm/Memory.hpp @@ -29,8 +29,6 @@ void STORMAPI SMemCopy(void* dst, void* src, size_t bytes); void STORMAPI SMemFill(void* ptr, size_t bytes, uint8_t value); -void STORMAPI SMemFree(void* ptr); - void STORMAPI SMemFree(void* ptr, const char* filename, int32_t linenumber, uint32_t flags = 0); void STORMAPI SMemMove(void* dst, void* src, size_t bytes); diff --git a/storm/thread/linux/S_Thread.cpp b/storm/thread/linux/S_Thread.cpp index f4943f3..4128104 100644 --- a/storm/thread/linux/S_Thread.cpp +++ b/storm/thread/linux/S_Thread.cpp @@ -20,7 +20,7 @@ void* S_Thread::s_SLaunchThread(void* threadParam) { pthread_cond_signal(¶ms->syncObject->m_cond); } - SMemFree(threadParam); + STORM_FREE(threadParam); return nullptr; } diff --git a/storm/thread/mac/S_Thread.mm b/storm/thread/mac/S_Thread.mm index 1adf9e0..8e2e3fb 100644 --- a/storm/thread/mac/S_Thread.mm +++ b/storm/thread/mac/S_Thread.mm @@ -37,7 +37,7 @@ uint32_t S_Thread::s_SLaunchThread(void* threadParam) { pthread_cond_signal(¶ms->syncObject->m_cond); } - SMemFree(threadParam); + STORM_FREE(threadParam); return 0; } diff --git a/storm/thread/win/S_Thread.cpp b/storm/thread/win/S_Thread.cpp index 0059b67..757f1eb 100644 --- a/storm/thread/win/S_Thread.cpp +++ b/storm/thread/win/S_Thread.cpp @@ -6,7 +6,7 @@ DWORD WINAPI S_Thread::s_SLaunchThread(void* threadParam) { auto proc = params->threadProc; auto param = params->threadParam; - SMemFree(threadParam); + STORM_FREE(threadParam); auto val = proc(param); diff --git a/test/Memory.cpp b/test/Memory.cpp index 849ac1b..7b3bf39 100644 --- a/test/Memory.cpp +++ b/test/Memory.cpp @@ -28,14 +28,14 @@ TEST_CASE("SMemAlloc", "[memory]") { void* ptr = SMemAlloc(16, __FILE__, __LINE__); REQUIRE(ptr != nullptr); CHECK_NOTHROW(memset(ptr, 1, 16)); - SMemFree(ptr); + STORM_FREE(ptr); } SECTION("allocates memory with null filename") { void* ptr = SMemAlloc(16, nullptr, 0); REQUIRE(ptr != nullptr); CHECK_NOTHROW(memset(ptr, 1, 16)); - SMemFree(ptr); + STORM_FREE(ptr); } SECTION("allocates memory initialized to 0 with flag") { @@ -45,13 +45,13 @@ TEST_CASE("SMemAlloc", "[memory]") { uint8_t* pArray = static_cast(ptr); CHECK(std::accumulate(pArray, pArray + 16, 0u) == 0); - SMemFree(ptr); + STORM_FREE(ptr); } SECTION("allocates a memory pointer even if the size is 0") { void* ptr = SMemAlloc(0, __FILE__, __LINE__); REQUIRE(ptr != nullptr); - SMemFree(ptr); + STORM_FREE(ptr); } } @@ -109,12 +109,6 @@ TEST_CASE("SMemFill", "[memory]") { } TEST_CASE("SMemFree", "[memory]") { - SECTION("does nothing on nullptr") { - CHECK_NOTHROW(SMemFree(nullptr)); - } -} - -TEST_CASE("SMemFree full args", "[memory]") { SECTION("does nothing on nullptr") { CHECK_NOTHROW(SMemFree(nullptr, __FILE__, __LINE__)); } @@ -162,14 +156,14 @@ TEST_CASE("SMemReAlloc", "[memory]") { void* ptr = SMemReAlloc(nullptr, 16, __FILE__, __LINE__); REQUIRE(ptr != nullptr); CHECK_NOTHROW(memset(ptr, 1, 16)); - SMemFree(ptr); + STORM_FREE(ptr); } SECTION("allocates memory with null filename") { void* ptr = SMemReAlloc(nullptr, 16, nullptr, 0); REQUIRE(ptr != nullptr); CHECK_NOTHROW(memset(ptr, 1, 16)); - SMemFree(ptr); + STORM_FREE(ptr); } SECTION("allocates memory initialized to 0 with flag") { @@ -179,13 +173,13 @@ TEST_CASE("SMemReAlloc", "[memory]") { uint8_t* pArray = static_cast(ptr); CHECK(std::accumulate(pArray, pArray + 16, 0u) == 0); - SMemFree(ptr); + STORM_FREE(ptr); } SECTION("allocates a memory pointer even if the size is 0") { void* ptr = SMemReAlloc(nullptr, 0, __FILE__, __LINE__); REQUIRE(ptr != nullptr); - SMemFree(ptr); + STORM_FREE(ptr); } SECTION("reallocates memory") { @@ -201,7 +195,7 @@ TEST_CASE("SMemReAlloc", "[memory]") { CHECK(*static_cast(ptr2) == 123456); CHECK_NOTHROW(memset(ptr2, 1, 1024 * 1024)); - SMemFree(ptr2); + STORM_FREE(ptr2); } } diff --git a/test/String.cpp b/test/String.cpp index f1e1b2b..437fa86 100644 --- a/test/String.cpp +++ b/test/String.cpp @@ -227,7 +227,7 @@ TEST_CASE("SStrDupA", "[string]") { auto string2 = SStrDupA(string1, __FILE__, __LINE__); auto compare = SStrCmp(string1, string2); auto newPtr = string1 != string2; - SMemFree(string2); + STORM_FREE(string2); REQUIRE(compare == 0); REQUIRE(newPtr == true); @@ -238,7 +238,7 @@ TEST_CASE("SStrDupA", "[string]") { auto string2 = SStrDupA(string1, __FILE__, __LINE__); auto compare = SStrCmp(string1, string2); auto newPtr = string1 != string2; - SMemFree(string2); + STORM_FREE(string2); REQUIRE(compare == 0); REQUIRE(newPtr == true);