summaryrefslogtreecommitdiff
path: root/src/code/system_malloc.c
diff options
context:
space:
mode:
authorTharo <17233964+Thar0@users.noreply.github.com>2024-02-27 07:37:33 +0000
committerGitHub <noreply@github.com>2024-02-27 02:37:33 -0500
commitdcf61174e90725bea9aeeae9176fd377e0358188 (patch)
tree742e8bc4819b23e2f7b2d87d9cc002532ccdc416 /src/code/system_malloc.c
parenta32221c36e955642d2da5a8314376dbf4c2e07c6 (diff)
Filename & line number args cleanup (#1891)
* Filename & line number args cleanup * Use int for line number args over s32/u32 * Add missing const qualifiers from filename args * Fix gcc warning in game.c * Add comment to weird assignments in GameState_Init
Diffstat (limited to 'src/code/system_malloc.c')
-rw-r--r--src/code/system_malloc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c
index 74e69ed46..efee95dbd 100644
--- a/src/code/system_malloc.c
+++ b/src/code/system_malloc.c
@@ -36,7 +36,7 @@ void* SystemArena_Malloc(u32 size) {
}
#if OOT_DEBUG
-void* SystemArena_MallocDebug(u32 size, const char* file, s32 line) {
+void* SystemArena_MallocDebug(u32 size, const char* file, int line) {
void* ptr = __osMallocDebug(&gSystemArena, size, file, line);
SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_DEBUG", "確保"); // "Secure"
@@ -52,7 +52,7 @@ void* SystemArena_MallocR(u32 size) {
}
#if OOT_DEBUG
-void* SystemArena_MallocRDebug(u32 size, const char* file, s32 line) {
+void* SystemArena_MallocRDebug(u32 size, const char* file, int line) {
void* ptr = __osMallocRDebug(&gSystemArena, size, file, line);
SYSTEM_ARENA_CHECK_POINTER(ptr, size, "malloc_r_DEBUG", "確保"); // "Secure"
@@ -67,7 +67,7 @@ void* SystemArena_Realloc(void* ptr, u32 newSize) {
}
#if OOT_DEBUG
-void* SystemArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) {
+void* SystemArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int line) {
ptr = __osReallocDebug(&gSystemArena, ptr, newSize, file, line);
SYSTEM_ARENA_CHECK_POINTER(ptr, newSize, "realloc_DEBUG", "再確保"); // "Re-securing"
return ptr;
@@ -79,7 +79,7 @@ void SystemArena_Free(void* ptr) {
}
#if OOT_DEBUG
-void SystemArena_FreeDebug(void* ptr, const char* file, s32 line) {
+void SystemArena_FreeDebug(void* ptr, const char* file, int line) {
__osFreeDebug(&gSystemArena, ptr, file, line);
}
#endif