From f600c79559892b73b019102478af501cf71fe6a4 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 28 May 2020 23:02:51 +0200
Subject: Added vsprintf support for serial connections

---
 src/kernel/lib/stdio/vprintf.c | 51 +++++-------------------------------------
 1 file changed, 5 insertions(+), 46 deletions(-)

(limited to 'src/kernel/lib/stdio/vprintf.c')

diff --git a/src/kernel/lib/stdio/vprintf.c b/src/kernel/lib/stdio/vprintf.c
index 4c0c432..2351d39 100644
--- a/src/kernel/lib/stdio/vprintf.c
+++ b/src/kernel/lib/stdio/vprintf.c
@@ -1,54 +1,13 @@
 #include <lib/stdio.h>
 #include <lib/stdlib.h>
-#include <lib/string.h>
-#include <memory/alloc.h>
-#include <stdarg.h>
 #include <stdint.h>
 
-void _puts(const char *data)
-{
-	for (u32 i = 0; i < strlen(data); i++)
-		putch(data[i]);
-}
-
+// TODO: Use global formatting function
 void vprintf(const char *fmt, va_list args)
 {
-	u8 readyToFormat = 0;
-
-	char buff = 0;
-
-	for (; *fmt; fmt++) {
-		if (readyToFormat) {
-			if (*fmt == '%') {
-				putch('%');
-				readyToFormat = 0;
-				continue;
-			}
+	char buf[1024];
+	vsprintf(buf, fmt, args);
 
-			buff = *fmt;
-			if (buff == 's') {
-				const char *str = va_arg(args, const char *);
-				_puts(str);
-				readyToFormat = 0;
-			} else if (buff == 'x') {
-				char *p = htoa((u32)va_arg(args, int));
-				_puts(p);
-				free(p);
-				readyToFormat = 0;
-			} else if (buff == 'd') {
-				char *p = itoa(va_arg(args, int));
-				_puts(p);
-				free(p);
-				readyToFormat = 0;
-			} else if (buff == 'c') {
-				putch((char)va_arg(args, int));
-				readyToFormat = 0;
-			}
-		} else {
-			if (*fmt == '%')
-				readyToFormat = 1;
-			else
-				putch(*fmt);
-		}
-	}
+	for (u32 i = 0; i < strlen(buf); i++)
+		putch(buf[i]);
 }
\ No newline at end of file
-- 
cgit v1.2.3