Changeset 28a5ebd in mainline for uspace/app/sbi/src

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:

uspace/app/sbi/src

Files:

• builtin/bi_char.c (modified) (1 diff)
• os/helenos.c (modified) (3 diffs)
• os/os.h (modified) (1 diff)
• os/posix.c (modified) (1 diff)

uspace/app/sbi/src/builtin/bi_char.c

@@ -90 +90 @@
         }
 
-        str = os_chr_to_astr((wchar_t) char_val);
+        str = os_chr_to_astr((char32_t) char_val);
 
         /* Ownership of str is transferred. */

uspace/app/sbi/src/os/helenos.c

@@ -94 +94 @@
         size_t i;
         size_t size;
-        wchar_t c;
+        char32_t c;
 
         assert(start + length <= str_length(str));
@@ -155 +155 @@
         size_t offset;
         int i;
-        wchar_t c = 0;
+        char32_t c = 0;
 
         if (index < 0)
@@ -178 +178 @@
  * @return              Newly allocated string.
  */
-char *os_chr_to_astr(wchar_t chr)
+char *os_chr_to_astr(char32_t chr)
 {
         char *str;

uspace/app/sbi/src/os/os.h

@@ -38 +38 @@
 size_t os_str_length(const char *str);
 errno_t os_str_get_char(const char *str, int index, int *out_char);
-char *os_chr_to_astr(wchar_t chr);
+char *os_chr_to_astr(char32_t chr);
 void os_input_disp_help(void);
 errno_t os_input_line(const char *prompt, char **ptr);

uspace/app/sbi/src/os/posix.c

@@ -164 +164 @@
  * @return              Newly allocated string.
  */
-char *os_chr_to_astr(wchar_t chr)
+char *os_chr_to_astr(char32_t chr)
 {
         char *str;