Changes in kernel/generic/src/printf/vprintf.c [28a5ebd:690ad20] in mainline

File:

• kernel/generic/src/printf/vprintf.c (modified) (2 diffs)

kernel/generic/src/printf/vprintf.c

@@ -33 +33 @@
  */
 
+#include <arch/asm.h>
+#include <console/console.h>
 #include <print.h>
-#include <printf/printf_core.h>
-#include <putchar.h>
+#include <printf_core.h>
+#include <str.h>
 #include <synch/spinlock.h>
-#include <arch/asm.h>
 #include <typedefs.h>
-#include <str.h>
 
-static int vprintf_str_write(const char *str, size_t size, void *data)
+static errno_t vprintf_str_write(const char *str, size_t size, void *data)
 {
-        size_t offset = 0;
-        size_t chars = 0;
-
-        while (offset < size) {
-                putuchar(str_decode(str, &offset, size));
-                chars++;
-        }
-
-        return chars;
-}
-
-static int vprintf_wstr_write(const char32_t *str, size_t size, void *data)
-{
-        size_t offset = 0;
-        size_t chars = 0;
-
-        while (offset < size) {
-                putuchar(str[chars]);
-                chars++;
-                offset += sizeof(char32_t);
-        }
-
-        return chars;
+        putstr(str, size);
+        return EOK;
 }
 
 int puts(const char *str)
 {
-        size_t offset = 0;
-        size_t chars = 0;
-        char32_t uc;
-
-        while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
-                putuchar(uc);
-                chars++;
-        }
-
-        putuchar('\n');
-        return chars;
+        size_t n = str_size(str);
+        putstr(str, n);
+        return n;
 }
 
@@ -87 +58 @@
         printf_spec_t ps = {
                 vprintf_str_write,
-                vprintf_wstr_write,
                 NULL
         };
 
-        return printf_core(fmt, &ps, ap);
+        console_lock();
+        int ret = printf_core(fmt, &ps, ap);
+        console_unlock();
+        return ret;
 }