diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/mem.c | 24 | ||||
| -rw-r--r-- | libc/print.c | 2 | ||||
| -rw-r--r-- | libc/stack.c | 2 |
3 files changed, 14 insertions, 14 deletions
@@ -364,23 +364,23 @@ void _free(void *ptr) void *malloc_debug(u32 size, const char *file, int line, const char *func, const char *inp) { void *ret = _malloc(size); -#ifdef kernel - printf("K"); -#else - printf("U"); -#endif - printf("MALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp); + /* #ifdef kernel */ + /* printf("K"); */ + /* #else */ + /* printf("U"); */ + /* #endif */ + /* printf("MALLOC\t%s:%d: %s: 0x%x %dB (%s)\n", file, line, func, ret, size, inp); */ return ret; } void free_debug(void *ptr, const char *file, int line, const char *func, const char *inp) { -#ifdef kernel - printf("K"); -#else - printf("U"); -#endif - printf("FREE\t%s:%d: %s: 0x%x (%s)\n", file, line, func, ptr, inp); + /* #ifdef kernel */ + /* printf("K"); */ + /* #else */ + /* printf("U"); */ + /* #endif */ + /* printf("FREE\t%s:%d: %s: 0x%x (%s)\n", file, line, func, ptr, inp); */ if (ptr) _free(ptr); } diff --git a/libc/print.c b/libc/print.c index 12ad33b..e98fca6 100644 --- a/libc/print.c +++ b/libc/print.c @@ -1,10 +1,10 @@ // MIT License, Copyright (c) 2020 Marvin Borner #include <arg.h> +#include <assert.h> #include <conv.h> #include <def.h> #include <mem.h> -#include <assert.h> #include <serial.h> #include <str.h> diff --git a/libc/stack.c b/libc/stack.c index c47dd59..cd5a2aa 100644 --- a/libc/stack.c +++ b/libc/stack.c @@ -115,7 +115,7 @@ void *stack_peek(struct stack *stack) if (!stack || !stack->tail) return NULL; - return stack->tail; + return stack->tail->data; } void stack_clear(struct stack *stack) |