Changeset 28a5ebd in mainline for uspace/app/kio/kio.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/app/kio/kio.c (modified) (6 diffs)

uspace/app/kio/kio.c

@@ -56 +56 @@
         link_t link;
         size_t length;
-        wchar_t *data;
+        char32_t *data;
 } item_t;
 
@@ -62 +62 @@
 
 /* Pointer to kio area */
-static wchar_t *kio = (wchar_t *) AS_AREA_ANY;
+static char32_t *kio = (char32_t *) AS_AREA_ANY;
 static size_t kio_length;
 
@@ -77 +77 @@
  *
  */
-static void producer(size_t length, wchar_t *data)
+static void producer(size_t length, char32_t *data)
 {
         item_t *item = (item_t *) malloc(sizeof(item_t));
@@ -83 +83 @@
                 return;
 
-        size_t sz = sizeof(wchar_t) * length;
-        wchar_t *buf = (wchar_t *) malloc(sz);
+        size_t sz = sizeof(char32_t) * length;
+        char32_t *buf = (char32_t *) malloc(sz);
         if (buf == NULL) {
                 free(item);
@@ -121 +121 @@
 
                 for (size_t i = 0; i < item->length; i++)
-                        putwchar(item->data[i]);
+                        putuchar(item->data[i]);
 
                 if (log != NULL) {
                         for (size_t i = 0; i < item->length; i++)
-                                fputwc(item->data[i], log);
+                                fputuc(item->data[i], log);
 
                         fflush(log);
@@ -202 +202 @@
 
         size_t size = pages * PAGE_SIZE;
-        kio_length = size / sizeof(wchar_t);
+        kio_length = size / sizeof(char32_t);
 
         rc = physmem_map(faddr, pages, AS_AREA_READ | AS_AREA_CACHEABLE,