Changeset 28a5ebd in mainline for uspace/app/bdsh/cmds/modules/printf/printf.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/bdsh/cmds/modules/printf/printf.c (modified) (4 diffs)

uspace/app/bdsh/cmds/modules/printf/printf.c

@@ -68 +68 @@
  * @param arg string with data to print.
  */
-static int print_arg(wchar_t ch, const char *arg)
+static int print_arg(char32_t ch, const char *arg)
 {
         switch (ch) {
@@ -93 +93 @@
  * @param ch  Control character.
  */
-static int process_ctl(wchar_t ch)
+static int process_ctl(char32_t ch)
 {
         switch (ch) {
@@ -120 +120 @@
         char *fmt;
         size_t pos, fmt_sz;
-        wchar_t ch;
+        char32_t ch;
         bool esc_flag = false;
         unsigned int carg;     // Current argument
@@ -170 +170 @@
                                 break;
                         }
-                        putwchar(ch);
+                        putuchar(ch);
                         break;
 
                 emit:
-                        putwchar(ch);
+                        putuchar(ch);
                         esc_flag = false;
                 }