Changeset ed88c8e in mainline for uspace/lib/fmtutil/fmtutil.c

Timestamp:

2018-05-29T13:25:07Z (6 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:

• uspace/lib/fmtutil/fmtutil.c (modified) (4 diffs)

uspace/lib/fmtutil/fmtutil.c

@@ -95 +95 @@
                 for (i = 0; i < width; i++) {
                         if (i < len)
-                                putchar(wstr[i]);
+                                putwchar(wstr[i]);
                         else
-                                putchar(' ');
+                                putwchar(' ');
                 }
         } else if (mode == ALIGN_RIGHT) {
                 for (i = 0; i < width; i++) {
                         if (i < width - len)
-                                putchar(' ');
+                                putwchar(' ');
                         else
-                                putchar(wstr[i - (width - len)]);
+                                putwchar(wstr[i - (width - len)]);
                 }
         } else if (mode == ALIGN_CENTER) {
@@ -110 +110 @@
                 for (i = 0; i < width; i++) {
                         if ((i < padding) || ((i - padding) >= len))
-                                putchar(' ');
+                                putwchar(' ');
                         else
-                                putchar(wstr[i - padding]);
+                                putwchar(wstr[i - padding]);
                 }
         } else if (mode == ALIGN_JUSTIFY) {
@@ -146 +146 @@
                                     (words - 1)));
                                 for (j = 0; j < spaces; j++) {
-                                        putchar(' ');
+                                        putwchar(' ');
                                 }
                                 done_chars += spaces;
                         }
                         while (i < len && wstr[i] != ' ') {
-                                putchar(wstr[i++]);
+                                putwchar(wstr[i++]);
                                 done_chars++;
                         }
@@ -158 +158 @@
         skip_words:
                 while (done_chars < width) {
-                        putchar(' ');
+                        putwchar(' ');
                         done_chars++;
                 }