From 58b4e00736c0f2f13a3e96b5fcb3c00623ed35be Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 9 Feb 2021 21:48:59 +0100
Subject: Quite many message queue fixes and impl start

---
 libc/mem.c   | 24 ++++++++++++------------
 libc/print.c |  2 +-
 libc/stack.c |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'libc')

diff --git a/libc/mem.c b/libc/mem.c
index aab68b2..f9eaa3a 100644
--- a/libc/mem.c
+++ b/libc/mem.c
@@ -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)
-- 
cgit v1.2.3