The-Homebrew-Cloud/wut
2
0
Fork 0
mirror of https://github.com/wiiu-env/wut.git synced 2024-12-13 11:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "whb: Use MEM2 heap instead of DefaultHeap in logging functions"

Browse Source 
This reverts commit ef34f600c7, meaning that MEMAllocFromDefaultHeapEx is now used again, instead of MEMAllocFromExpHeapEx and MEMGetBaseHeapHandle.
This commit is contained in:
CreeperMario 2017-10-10 09:22:13 +10:30
parent 76a8b8e292
commit 758e91f65f
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/libwhb/src/log.c
View File

@ -1,5 +1,4 @@
#include <coreinit/baseheap.h> #include <defaultheap.h>
#include <coreinit/expandedheap.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -58,8 +57,7 @@ WHBLogWrite(const char *str)
BOOL BOOL
WHBLogPrint(const char *str) WHBLogPrint(const char *str)
{ {
MEMHeapHandle mem2_handle = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM2); char *buf = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4);
char *buf = MEMAllocFromExpHeapEx(mem2_handle, PRINTF_BUFFER_LENGTH, 4);
if(!buf) { if(!buf) {
return FALSE; return FALSE;
} }
@ -73,15 +71,14 @@ WHBLogPrint(const char *str)
} }
} }
MEMFreeToExpHeap(mem2_handle, buf); MEMFreeToDefaultHeap(buf);
return TRUE; return TRUE;
} }
BOOL BOOL
WHBLogWritef(const char *fmt, ...) WHBLogWritef(const char *fmt, ...)
{ {
MEMHeapHandle mem2_handle = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM2); char *buf = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4);
char *buf = MEMAllocFromExpHeapEx(mem2_handle, PRINTF_BUFFER_LENGTH, 4);
va_list va; va_list va;
if (!buf) { if (!buf) {
@ -98,7 +95,7 @@ WHBLogWritef(const char *fmt, ...)
} }
} }
MEMFreeToExpHeap(mem2_handle, buf); MEMFreeToDefaultHeap(buf);
va_end(va); va_end(va);
return TRUE; return TRUE;
} }
@ -106,9 +103,8 @@ WHBLogWritef(const char *fmt, ...)
BOOL BOOL
WHBLogPrintf(const char *fmt, ...) WHBLogPrintf(const char *fmt, ...)
{ {
MEMHeapHandle mem2_handle = MEMGetBaseHeapHandle(MEM_BASE_HEAP_MEM2); char *buf1 = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4);
char *buf1 = MEMAllocFromExpHeapEx(mem2_handle, PRINTF_BUFFER_LENGTH, 4); char *buf2 = MEMAllocFromDefaultHeapEx(PRINTF_BUFFER_LENGTH, 4);
char *buf2 = MEMAllocFromExpHeapEx(mem2_handle, PRINTF_BUFFER_LENGTH, 4);
va_list va; va_list va;
if (!buf1) { if (!buf1) {
@ -116,7 +112,7 @@ WHBLogPrintf(const char *fmt, ...)
} }
if(!buf2) { if(!buf2) {
MEMFreeToExpHeap(mem2_handle, buf1); MEMFreeToDefaultHeap(buf1);
return FALSE; return FALSE;
} }
@ -132,8 +128,8 @@ WHBLogPrintf(const char *fmt, ...)
} }
} }
MEMFreeToExpHeap(mem2_handle, buf1); MEMFreeToDefaultHeap(buf1);
MEMFreeToExpHeap(mem2_handle, buf2); MEMFreeToDefaultHeap(buf2);
va_end(va); va_end(va);
return TRUE; return TRUE;
} }