Changeset 28a5ebd in mainline for uspace/lib/ext4/src/superblock.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/ext4/src/superblock.c (modified) (3 diffs)

uspace/lib/ext4/src/superblock.c

@@ -889 +889 @@
         size_t i;
         size_t wi;
-        wchar_t ch;
+        char32_t ch;
         errno_t rc;
 
@@ -896 +896 @@
         while (sb->volume_name[i] != '\0' && i < sizeof(sb->volume_name)) {
                 /* ISO 8859-1 codes map to identical Unicode code points */
-                ch = (wchar_t)(uint8_t)sb->volume_name[i];
+                ch = (char32_t)(uint8_t)sb->volume_name[i];
                 rc = chr_encode(ch, buf, &wi, bufsz - 1);
                 if (rc != EOK)
@@ -917 +917 @@
 {
         size_t off;
-        wchar_t ch;
+        char32_t ch;
         size_t wi;