From f209faffab90186cd88cd0a2fe2cc6236bb53e15 Mon Sep 17 00:00:00 2001
From: Anton Kling <anton@kling.gg>
Date: Mon, 17 Jun 2024 22:07:38 +0200
Subject: Reorganize logging code

---
 kernel/libc/stdio/print.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'kernel/libc/stdio')

diff --git a/kernel/libc/stdio/print.c b/kernel/libc/stdio/print.c
index 93393ee..e8b245f 100644
--- a/kernel/libc/stdio/print.c
+++ b/kernel/libc/stdio/print.c
@@ -1,7 +1,6 @@
-#include "../../drivers/serial.h"
-#include "../include/assert.h"
-#include "../include/stdio.h"
-#include <stdarg.h>
+#include <assert.h>
+#include <drivers/serial.h>
+#include <stdio.h>
 
 #define TAB_SIZE 8
 
@@ -55,11 +54,8 @@ int kprint_int(int num) {
   return c;
 }
 
-int kprintf(const char *format, ...) {
+int vkprintf(const char *format, va_list list) {
   int c = 0;
-  va_list list;
-  va_start(list, format);
-
   const char *s = format;
   for (; *s; s++) {
     if ('%' != *s) {
@@ -101,6 +97,10 @@ int kprintf(const char *format, ...) {
   return c;
 }
 
-int puts(char *str) {
-  return kprintf("%s\n", str);
+int kprintf(const char *format, ...) {
+  va_list list;
+  va_start(list, format);
+  int rc = vkprintf(format, list);
+  va_end(list);
+  return rc;
 }
-- 
cgit v1.2.3