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

Timestamp:

2025-04-18T15:14:10Z (2 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/vprintf.c (modified) (2 diffs)

uspace/lib/c/generic/io/vprintf.c

@@ -42 +42 @@
 static FIBRIL_MUTEX_INITIALIZE(printf_mutex);
 
-static int vprintf_str_write(const char *str, size_t size, void *stream)
+static errno_t vprintf_str_write(const char *str, size_t size, void *stream)
 {
-        size_t wr = fwrite(str, 1, size, (FILE *) stream);
-        return str_nlength(str, wr);
-}
+        errno_t old_errno = errno;
 
-static int vprintf_wstr_write(const char32_t *str, size_t size, void *stream)
-{
-        size_t offset = 0;
-        size_t chars = 0;
+        errno = EOK;
+        size_t written = fwrite(str, 1, size, (FILE *) stream);
 
-        while (offset < size) {
-                if (fputuc(str[chars], (FILE *) stream) <= 0)
-                        break;
+        if (errno == EOK && written != size)
+                errno = EIO;
 
-                chars++;
-                offset += sizeof(char32_t);
-        }
+        if (errno != EOK)
+                return errno;
 
-        return chars;
+        errno = old_errno;
+        return EOK;
 }
 
@@ -77 +72 @@
         printf_spec_t ps = {
                 vprintf_str_write,
-                vprintf_wstr_write,
                 stream
         };