Replaced vesa print functions with printf

2 files changed, 54 insertions, 47 deletions

diff --git a/src/mlibc/stdio/printf.c b/src/mlibc/stdio/printf.c
index 23d8e6e..5617d03 100644
--- a/src/mlibc/stdio/printf.c
+++ b/src/mlibc/stdio/printf.c
@@ -1,55 +1,10 @@
 #include <stdarg.h>
-#include <stdint.h>
 #include <mlibc/stdio.h>
-#include <mlibc/string.h>
-#include <mlibc/stdlib.h>
-
-void __writes(const char *data)
-{
-    for (size_t i = 0; i < strlen(data); i++) writec(data[i]);
-}
 
 void printf(const char *fmt, ...)
 {
     va_list args;
     va_start(args, fmt);
-
-    uint8_t readyToFormat = 0;
-
-    char buff = 0;
-
-    for (; *fmt; fmt++) {
-        if (readyToFormat) {
-            if (*fmt == '%') {
-                writec('%');
-                readyToFormat = 0;
-                continue;
-            }
-
-            buff = *fmt;
-            if (buff == 's') {
-                const char *str = va_arg(args, const char*);
-                __writes(str);
-                readyToFormat = 0;
-            } else if (buff == 'x') {
-                char *p = htoa((uint32_t) va_arg(args, int));
-                __writes(p);
-                kfree(p);
-                readyToFormat = 0;
-            } else if (buff == 'd') {
-                char *p = itoa(va_arg(args, int));
-                __writes(p);
-                kfree(p);
-                readyToFormat = 0;
-            } else if (buff == 'c') {
-                writec((char) va_arg(args, int));
-                readyToFormat = 0;
-            }
-        } else {
-            if (*fmt == '%')
-                readyToFormat = 1;
-            else
-                writec(*fmt);
-        }
-    }
+    vprintf(fmt, args);
+    va_end(args);
 }
\ No newline at end of file
diff --git a/src/mlibc/stdio/vprintf.c b/src/mlibc/stdio/vprintf.c
new file mode 100644
index 0000000..81efce2
--- /dev/null
+++ b/src/mlibc/stdio/vprintf.c
@@ -0,0 +1,52 @@
+#include <stdarg.h>
+#include <stdint.h>
+#include <mlibc/stdio.h>
+#include <mlibc/string.h>
+#include <mlibc/stdlib.h>
+
+void __writes(const char *data)
+{
+    for (size_t i = 0; i < strlen(data); i++) writec(data[i]);
+}
+
+void vprintf(const char *fmt, va_list args)
+{
+    uint8_t readyToFormat = 0;
+
+    char buff = 0;
+
+    for (; *fmt; fmt++) {
+        if (readyToFormat) {
+            if (*fmt == '%') {
+                writec('%');
+                readyToFormat = 0;
+                continue;
+            }
+
+            buff = *fmt;
+            if (buff == 's') {
+                const char *str = va_arg(args, const char*);
+                __writes(str);
+                readyToFormat = 0;
+            } else if (buff == 'x') {
+                char *p = htoa((uint32_t) va_arg(args, int));
+                __writes(p);
+                kfree(p);
+                readyToFormat = 0;
+            } else if (buff == 'd') {
+                char *p = itoa(va_arg(args, int));
+                __writes(p);
+                kfree(p);
+                readyToFormat = 0;
+            } else if (buff == 'c') {
+                writec((char) va_arg(args, int));
+                readyToFormat = 0;
+            }
+        } else {
+            if (*fmt == '%')
+                readyToFormat = 1;
+            else
+                writec(*fmt);
+        }
+    }
+}
\ No newline at end of file