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

• uspace/lib/c/generic/io/vsnprintf.c (modified) (3 diffs)

uspace/lib/c/generic/io/vsnprintf.c

@@ -88 +88 @@
 
                 while (index < size) {
-                        wchar_t uc = str_decode(str, &index, size);
+                        char32_t uc = str_decode(str, &index, size);
 
                         if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK)
@@ -133 +133 @@
  *
  */
-static int vsnprintf_wstr_write(const wchar_t *str, size_t size, vsnprintf_data_t *data)
+static int vsnprintf_wstr_write(const char32_t *str, size_t size, vsnprintf_data_t *data)
 {
         size_t index = 0;
 
-        while (index < (size / sizeof(wchar_t))) {
+        while (index < (size / sizeof(char32_t))) {
                 size_t left = data->size - data->len;
 
@@ -177 +177 @@
         printf_spec_t ps = {
                 (int (*) (const char *, size_t, void *)) vsnprintf_str_write,
-                (int (*) (const wchar_t *, size_t, void *)) vsnprintf_wstr_write,
+                (int (*) (const char32_t *, size_t, void *)) vsnprintf_wstr_write,
                 &data
         };