Changeset ed88c8e in mainline for kernel/generic/src/console/console.c

Timestamp:

2018-05-29T13:25:07Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fc0b2a8

Parents:

a57fa32

git-author:

Jiri Svoboda <jiri@…> (2018-05-28 17:24:17)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-29 13:25:07)

Message:

fputc, putchar vs. fputwc, putwchar.

File:

• kernel/generic/src/console/console.c (modified) (5 diffs)

kernel/generic/src/console/console.c

@@ -262 +262 @@
                         if (count > 0) {
                                 /* Space, backspace, space */
-                                putchar('\b');
-                                putchar(' ');
-                                putchar('\b');
+                                putwchar('\b');
+                                putwchar(' ');
+                                putwchar('\b');
 
                                 count--;
@@ -273 +273 @@
 
                 if (chr_encode(ch, buf, &offset, buflen - 1) == EOK) {
-                        putchar(ch);
+                        putwchar(ch);
                         count++;
                         buf[offset] = 0;
@@ -286 +286 @@
 {
         wchar_t ch = indev_pop_character(indev);
-        putchar(ch);
+        putwchar(ch);
         return ch;
 }
@@ -356 +356 @@
 }
 
-void putchar(const wchar_t ch)
+void putwchar(const wchar_t ch)
 {
         bool ordy = ((stdout) && (stdout->op->write));
@@ -373 +373 @@
                  * for possible future output.
                  *
-                 * The early_putchar() function is used to output
+                 * The early_putwchar() function is used to output
                  * the character for low-level debugging purposes.
                  * Note that the early_putc() function might be
                  * a no-op on certain hardware configurations.
                  */
-                early_putchar(ch);
+                early_putwchar(ch);
         }