Changeset 29e7cc7 in mainline for uspace/lib/c/generic/io/kio.c

Timestamp:

2025-04-18T15:14:10Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (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.

Message:

Merge branch 'upstream/master' into helenraid

File:

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

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

@@ -34 +34 @@
  */
 
+#include <abi/syscall.h>
 #include <stddef.h>
 #include <libc.h>
@@ -112 +113 @@
 }
 
+size_t kio_read(char *buf, size_t n, size_t at)
+{
+        return __SYSCALL3(SYS_KIO_READ, (sysarg_t) buf, n, at);
+}
+
 /** Print formatted text to kio.
  *
@@ -131 +137 @@
 }
 
-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 +155 @@
         printf_spec_t ps = {
                 kio_vprintf_str_write,
-                kio_vprintf_wstr_write,
                 NULL
         };