ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

make mem alloc functions more consistent

Browse Source
This commit is contained in:
YamaArashi 2016-01-03 19:03:30 -08:00
parent ccfaadc775
commit c013862b69
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/malloc.c
View File

@ -41,8 +41,9 @@ void PutFirstMemBlockHeader(void *block, u32 size)
PutMemBlockHeader(block, (struct MemBlock *)block, (struct MemBlock *)block, size - 16);
}
void *AllocInternal(struct MemBlock *pos, u32 size)
void *AllocInternal(void *heapStart, u32 size)
{
struct MemBlock *pos = (struct MemBlock *)heapStart;
struct MemBlock *head = pos;
struct MemBlock *splitBlock;
u32 foundBlockSize;
@ -128,7 +129,7 @@ void FreeInternal(void *heapStart, void *pointer)
void *AllocZeroedInternal(void *heapStart, u32 size)
{
void *mem = AllocInternal((struct MemBlock *)heapStart, size);
void *mem = AllocInternal(heapStart, size);
if (mem != NULL) {
u32 zero;