Changeset 28a5ebd in mainline for uspace/srv/fs

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/srv/fs

Files:

• exfat/exfat_dentry.c (modified) (2 diffs)
• exfat/exfat_dentry.h (modified) (2 diffs)
• fat/fat_dentry.c (modified) (2 diffs)

uspace/srv/fs/exfat/exfat_dentry.c

@@ -110 +110 @@
 }
 
-bool exfat_valid_char(wchar_t ch)
+bool exfat_valid_char(char32_t ch)
 {
         if (ch >= 0x01 && ch <= 0x1F)
@@ -134 +134 @@
 {
         size_t off = 0;
-        wchar_t ch;
+        char32_t ch;
 
         while ((ch = str_decode(name, &off, STR_NO_LIMIT)) != 0) {

uspace/srv/fs/exfat/exfat_dentry.h

@@ -37 +37 @@
 #include <stdint.h>
 #include <stdbool.h>
+#include <uchar.h>
 
 #define EXFAT_FILENAME_LEN      255
@@ -156 +157 @@
     uint16_t *);
 
-extern bool exfat_valid_char(wchar_t);
+extern bool exfat_valid_char(char32_t);
 extern bool exfat_valid_name(const char *);
 

uspace/srv/fs/fat/fat_dentry.c

@@ -360 +360 @@
 void str_to_ascii(char *dst, const char *src, size_t count, uint8_t pad)
 {
-        wchar_t ch;
+        char32_t ch;
         size_t off = 0;
         size_t i = 0;
@@ -381 +381 @@
 bool fat_valid_name(const char *name)
 {
-        wchar_t ch;
+        char32_t ch;
         size_t offset = 0;
         bool result = true;