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

uspace/lib/c/generic/io/chargrid.c

@@ -140 +140 @@
  *
  */
-sysarg_t chargrid_putwchar(chargrid_t *scrbuf, wchar_t ch, bool update)
+sysarg_t chargrid_putuchar(chargrid_t *scrbuf, char32_t ch, bool update)
 {
         assert(scrbuf->col < scrbuf->cols);
@@ -199 +199 @@
 
         for (sysarg_t i = 0; i < spaces; i++)
-                flush += chargrid_putwchar(scrbuf, ' ', true) - 1;
+                flush += chargrid_putuchar(scrbuf, ' ', true) - 1;
 
         return flush;
@@ -228 +228 @@
                 scrbuf->row--;
 
-                chargrid_putwchar(scrbuf, ' ', false);
+                chargrid_putuchar(scrbuf, ' ', false);
                 return 2;
         }
 
         scrbuf->col--;
-        chargrid_putwchar(scrbuf, ' ', false);
+        chargrid_putuchar(scrbuf, ' ', false);
         return 1;
 }