From dcf61174e90725bea9aeeae9176fd377e0358188 Mon Sep 17 00:00:00 2001
From: Tharo <17233964+Thar0@users.noreply.github.com>
Date: Tue, 27 Feb 2024 07:37:33 +0000
Subject: 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
---
 src/code/debug_malloc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/code/debug_malloc.c')

diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c
index 1f00167bd..3ca092bd3 100644
--- a/src/code/debug_malloc.c
+++ b/src/code/debug_malloc.c
@@ -36,7 +36,7 @@ void* DebugArena_Malloc(u32 size) {
 }
 
 #if OOT_DEBUG
-void* DebugArena_MallocDebug(u32 size, const char* file, s32 line) {
+void* DebugArena_MallocDebug(u32 size, const char* file, int line) {
     void* ptr = __osMallocDebug(&sDebugArena, size, file, line);
 
     DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_DEBUG", "確保"); // "Secure"
@@ -52,7 +52,7 @@ void* DebugArena_MallocR(u32 size) {
 }
 
 #if OOT_DEBUG
-void* DebugArena_MallocRDebug(u32 size, const char* file, s32 line) {
+void* DebugArena_MallocRDebug(u32 size, const char* file, int line) {
     void* ptr = __osMallocRDebug(&sDebugArena, size, file, line);
 
     DEBUG_ARENA_CHECK_POINTER(ptr, size, "debug_malloc_r_DEBUG", "確保"); // "Secure"
@@ -67,7 +67,7 @@ void* DebugArena_Realloc(void* ptr, u32 newSize) {
 }
 
 #if OOT_DEBUG
-void* DebugArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) {
+void* DebugArena_ReallocDebug(void* ptr, u32 newSize, const char* file, int line) {
     ptr = __osReallocDebug(&sDebugArena, ptr, newSize, file, line);
     DEBUG_ARENA_CHECK_POINTER(ptr, newSize, "debug_realloc_DEBUG", "再確保"); // "Re-securing"
     return ptr;
@@ -79,7 +79,7 @@ void DebugArena_Free(void* ptr) {
 }
 
 #if OOT_DEBUG
-void DebugArena_FreeDebug(void* ptr, const char* file, s32 line) {
+void DebugArena_FreeDebug(void* ptr, const char* file, int line) {
     __osFreeDebug(&sDebugArena, ptr, file, line);
 }
 #endif
-- 
cgit v1.2.3