Changeset 28a5ebd in mainline for kernel/generic/src/printf

Timestamp:

2020-06-18T15:39:50Z (5 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.

Location:

kernel/generic/src/printf

Files:

• printf_core.c (modified) (8 diffs)
• vprintf.c (modified) (4 diffs)
• vsnprintf.c (modified) (3 diffs)

kernel/generic/src/printf/printf_core.c

@@ -139 +139 @@
  *
  */
-static int printf_wputnchars(const wchar_t *buf, size_t size,
+static int printf_wputnchars(const char32_t *buf, size_t size,
     printf_spec_t *ps)
 {
@@ -185 +185 @@
  *
  */
-static int printf_putwchar(const wchar_t ch, printf_spec_t *ps)
+static int printf_putuchar(const char32_t ch, printf_spec_t *ps)
 {
         if (!chr_check(ch))
                 return ps->str_write((void *) &invalch, 1, ps->data);
 
-        return ps->wstr_write(&ch, sizeof(wchar_t), ps->data);
+        return ps->wstr_write(&ch, sizeof(char32_t), ps->data);
 }
 
@@ -240 +240 @@
  *
  */
-static int print_wchar(const wchar_t ch, int width, uint32_t flags, printf_spec_t *ps)
+static int print_wchar(const char32_t ch, int width, uint32_t flags, printf_spec_t *ps)
 {
         size_t counter = 0;
@@ -254 +254 @@
         }
 
-        if (printf_putwchar(ch, ps) > 0)
+        if (printf_putuchar(ch, ps) > 0)
                 counter++;
 
@@ -326 +326 @@
  * @return Number of wide characters printed, negative value on failure.
  */
-static int print_wstr(wchar_t *str, int width, unsigned int precision,
+static int print_wstr(char32_t *str, int width, unsigned int precision,
     uint32_t flags, printf_spec_t *ps)
 {
@@ -576 +576 @@
  *  - "l"  Signed or unsigned long int.@n
  *         If conversion is "c", the character is wint_t (wide character).@n
- *         If conversion is "s", the string is wchar_t * (wide string).@n
+ *         If conversion is "s", the string is char32_t * (UTF-32 string).@n
  *  - "ll" Signed or unsigned long long int.@n
  *  - "z"  Signed or unsigned ssize_t or site_t.@n
@@ -630 +630 @@
         while (true) {
                 i = nxt;
-                wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                char32_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
 
                 if (uc == 0)
@@ -789 +789 @@
                         case 's':
                                 if (qualifier == PrintfQualifierLong)
-                                        retval = print_wstr(va_arg(ap, wchar_t *), width, precision, flags, ps);
+                                        retval = print_wstr(va_arg(ap, char32_t *), width, precision, flags, ps);
                                 else
                                         retval = print_str(va_arg(ap, char *), width, precision, flags, ps);

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;
 }

kernel/generic/src/printf/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
         };