Changeset 61c91532 in mainline for kernel/generic/src/printf/vprintf.c

Timestamp:

2025-04-17T16:18:27Z (5 days ago)

Author:

GitHub <noreply@…>

Children:

634340fd

Parents:

a65ccc4 (diff), 888c06e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-17 16:18:27)

git-committer:

GitHub <noreply@…> (2025-04-17 16:18:27)

Message:

Merge branch 'HelenOS:master' into master

File:

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

kernel/generic/src/printf/vprintf.c

@@ -37 +37 @@
 #include <print.h>
 #include <printf_core.h>
-#include <putchar.h>
 #include <str.h>
 #include <synch/spinlock.h>
@@ -44 +43 @@
 static errno_t vprintf_str_write(const char *str, size_t size, void *data)
 {
-        size_t offset = 0;
-
-        while (offset < size)
-                putuchar(str_decode(str, &offset, size));
-
+        putstr(str, size);
         return EOK;
 }
@@ -54 +49 @@
 int puts(const char *str)
 {
-        size_t offset = 0;
-        size_t chars = 0;
-        char32_t uc;
-
-        console_lock();
-
-        while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
-                putuchar(uc);
-                chars++;
-        }
-
-        putuchar('\n');
-
-        console_unlock();
-        return chars;
+        size_t n = str_size(str);
+        putstr(str, n);
+        return n;
 }