Changeset 28a5ebd in mainline for uspace/lib/fmtutil/fmtutil.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/fmtutil/fmtutil.c (modified) (9 diffs)

uspace/lib/fmtutil/fmtutil.c

@@ -62 +62 @@
 
 /** Line consumer that prints the lines aligned according to spec */
-static errno_t print_line(wchar_t *wstr, size_t chars, bool last, void *data)
+static errno_t print_line(char32_t *wstr, size_t chars, bool last, void *data)
 {
         printmode_t *pm = (printmode_t *) data;
-        wchar_t old_char = wstr[chars];
+        char32_t old_char = wstr[chars];
         wstr[chars] = 0;
         errno_t rc = print_aligned_w(wstr, pm->width, last, pm->alignment);
@@ -78 +78 @@
         pm.newline_always = false;
         pm.width = width;
-        wchar_t *wstr = str_to_awstr(str);
+        char32_t *wstr = str_to_awstr(str);
         if (wstr == NULL) {
                 return ENOMEM;
@@ -87 +87 @@
 }
 
-errno_t print_aligned_w(const wchar_t *wstr, size_t width, bool last,
+errno_t print_aligned_w(const char32_t *wstr, size_t width, bool last,
     align_mode_t mode)
 {
@@ -95 +95 @@
                 for (i = 0; i < width; i++) {
                         if (i < len)
-                                putwchar(wstr[i]);
+                                putuchar(wstr[i]);
                         else
-                                putwchar(' ');
+                                putuchar(' ');
                 }
         } else if (mode == ALIGN_RIGHT) {
                 for (i = 0; i < width; i++) {
                         if (i < width - len)
-                                putwchar(' ');
+                                putuchar(' ');
                         else
-                                putwchar(wstr[i - (width - len)]);
+                                putuchar(wstr[i - (width - len)]);
                 }
         } else if (mode == ALIGN_CENTER) {
@@ -110 +110 @@
                 for (i = 0; i < width; i++) {
                         if ((i < padding) || ((i - padding) >= len))
-                                putwchar(' ');
+                                putuchar(' ');
                         else
-                                putwchar(wstr[i - padding]);
+                                putuchar(wstr[i - padding]);
                 }
         } else if (mode == ALIGN_JUSTIFY) {
@@ -146 +146 @@
                                     (words - 1)));
                                 for (j = 0; j < spaces; j++) {
-                                        putwchar(' ');
+                                        putuchar(' ');
                                 }
                                 done_chars += spaces;
                         }
                         while (i < len && wstr[i] != ' ') {
-                                putwchar(wstr[i++]);
+                                putuchar(wstr[i++]);
                                 done_chars++;
                         }
@@ -158 +158 @@
         skip_words:
                 while (done_chars < width) {
-                        putwchar(' ');
+                        putuchar(' ');
                         done_chars++;
                 }
@@ -169 +169 @@
 errno_t print_aligned(const char *str, size_t width, bool last, align_mode_t mode)
 {
-        wchar_t *wstr = str_to_awstr(str);
+        char32_t *wstr = str_to_awstr(str);
         if (wstr == NULL) {
                 return ENOMEM;
@@ -178 +178 @@
 }
 
-errno_t wrap(wchar_t *wstr, size_t width, line_consumer_fn consumer, void *data)
+errno_t wrap(char32_t *wstr, size_t width, line_consumer_fn consumer, void *data)
 {
         size_t word_start = 0;