Changeset c7c6afd in mainline for uspace/lib/c/generic/io/kio.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:

• uspace/lib/c/generic/io/kio.c (modified) (2 diffs)

uspace/lib/c/generic/io/kio.c

@@ -131 +131 @@
 }
 
-static int kio_vprintf_str_write(const char *str, size_t size, void *data)
+static errno_t kio_vprintf_str_write(const char *str, size_t size, void *data)
 {
-        size_t wr;
-
-        wr = 0;
-        (void) kio_write(str, size, &wr);
-        return str_nlength(str, wr);
-}
-
-static int kio_vprintf_wstr_write(const char32_t *str, size_t size, void *data)
-{
-        size_t offset = 0;
-        size_t chars = 0;
-        size_t wr;
-
-        while (offset < size) {
-                char buf[STR_BOUNDS(1)];
-                size_t sz = 0;
-
-                if (chr_encode(str[chars], buf, &sz, STR_BOUNDS(1)) == EOK)
-                        kio_write(buf, sz, &wr);
-
-                chars++;
-                offset += sizeof(char32_t);
-        }
-
-        return chars;
+        size_t wr = 0;
+        return kio_write(str, size, &wr);
 }
 
@@ -172 +149 @@
         printf_spec_t ps = {
                 kio_vprintf_str_write,
-                kio_vprintf_wstr_write,
                 NULL
         };