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

Timestamp:

2020-06-18T15:39:50Z (4 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ce52c333

Parents:

4f663f3e

Message:

Use char32_t instead of wchat_t to represent UTF-32 strings

The intention of the native HelenOS string API has been always to
support Unicode in the UTF-8 and UTF-32 encodings as the sole character
representations and ignore the obsolete mess of older single-byte and
multibyte character encodings. Before C11, the wchar_t type has been
slightly misused for the purpose of the UTF-32 strings. The newer
char32_t type is obviously a much more suitable option. The standard
defines char32_t as uint_least32_t, thus we can take the liberty to fix
it to uint32_t.

To maintain compatilibity with the C Standard, the putwchar(wchar_t)
functions has been replaced by our custom putuchar(char32_t) functions
where appropriate.

File:

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

kernel/generic/src/printf/vprintf.c

@@ -47 +47 @@
 
         while (offset < size) {
-                putwchar(str_decode(str, &offset, size));
+                putuchar(str_decode(str, &offset, size));
                 chars++;
         }
@@ -54 +54 @@
 }
 
-static int vprintf_wstr_write(const wchar_t *str, size_t size, void *data)
+static int vprintf_wstr_write(const char32_t *str, size_t size, void *data)
 {
         size_t offset = 0;
@@ -60 +60 @@
 
         while (offset < size) {
-                putwchar(str[chars]);
+                putuchar(str[chars]);
                 chars++;
-                offset += sizeof(wchar_t);
+                offset += sizeof(char32_t);
         }
 
@@ -72 +72 @@
         size_t offset = 0;
         size_t chars = 0;
-        wchar_t uc;
+        char32_t uc;
 
         while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
-                putwchar(uc);
+                putuchar(uc);
                 chars++;
         }
 
-        putwchar('\n');
+        putuchar('\n');
         return chars;
 }