Changeset 28a5ebd in mainline for uspace/lib/bithenge

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/lib/bithenge/src

Files:

• helenos/common.h (modified) (2 diffs)
• linux/common.h (modified) (3 diffs)
• print.c (modified) (2 diffs)

uspace/lib/bithenge/src/helenos/common.h

@@ -47 +47 @@
         const char *string;
         size_t offset;
-        wchar_t ch;
+        char32_t ch;
 } string_iterator_t;
 
@@ -64 +64 @@
 }
 
-static inline errno_t string_iterator_next(string_iterator_t *i, wchar_t *out)
+static inline errno_t string_iterator_next(string_iterator_t *i, char32_t *out)
 {
         *out = i->ch;

uspace/lib/bithenge/src/linux/common.h

@@ -37 +37 @@
 #include <stdlib.h>
 #include <string.h>
-#include <wchar.h>
+#include <uchar.h>
 
 #define max(aleph, bet) ((aleph) > (bet) ? (aleph) : (bet))
@@ -55 +55 @@
 }
 
-static inline errno_t string_iterator_next(string_iterator_t *i, wchar_t *out)
+static inline errno_t string_iterator_next(string_iterator_t *i, char32_t *out)
 {
         wint_t rc = btowc(*(*i)++); // TODO
-        *out = (wchar_t) rc;
+        *out = (char32_t) rc;
         return rc == WEOF ? EILSEQ : EOK;
 }
@@ -72 +72 @@
 }
 
-static inline const char *str_chr(const char *string, wchar_t ch)
+static inline const char *str_chr(const char *string, char32_t ch)
 {
         return strchr(string, wctob(ch)); // TODO

uspace/lib/bithenge/src/print.c

@@ -40 +40 @@
 #include <stdarg.h>
 #include <stdio.h>
-#include <wchar.h>
+#include <uchar.h>
 #include <bithenge/blob.h>
 #include <bithenge/print.h>
@@ -164 +164 @@
         string_iterator_t i = string_iterator(value);
         while (!string_iterator_done(&i)) {
-                wchar_t ch;
+                char32_t ch;
                 errno_t rc = string_iterator_next(&i, &ch);
                 if (rc != EOK)