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

Timestamp:

2025-04-13T23:27:44Z (4 weeks ago)

Author:

GitHub <noreply@…>

Children:

b6061f8c

Parents:

240b2e4 (diff), f5e1692 (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-13 23:27:44)

git-committer:

GitHub <noreply@…> (2025-04-13 23:27:44)

Message:

Merge branch 'HelenOS:master' into master

File:

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

kernel/generic/src/printf/vprintf.c

@@ -36 +36 @@
 #include <console/console.h>
 #include <print.h>
-#include <printf/printf_core.h>
+#include <printf_core.h>
 #include <putchar.h>
 #include <str.h>
@@ -42 +42 @@
 #include <typedefs.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) {
+        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;
+        return EOK;
 }
 
@@ -92 +75 @@
         printf_spec_t ps = {
                 vprintf_str_write,
-                vprintf_wstr_write,
                 NULL
         };