Changeset 10d73d8 in mainline

Timestamp:

2009-03-24T15:27:08Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6a75902c

Parents:

08b5601

Message:

fix wchar_t printing

Location:

kernel

Files:

• generic/src/printf/printf_core.c (modified) (1 diff)
• test/print/print4.c (modified) (2 diffs)

kernel/generic/src/printf/printf_core.c

@@ -160 +160 @@
                 return ps->write_utf8((void *) &invalch, 1, ps->data);
         
-        return ps->write_utf32(&ch, 1, ps->data);
+        return ps->write_utf32(&ch, sizeof(wchar_t), ps->data);
 }
 

kernel/test/print/print4.c

@@ -50 +50 @@
                 }
                 
-                printf("\nExtended ASCII characters (128 - 255) using printf(\"%%c\") and printf(\"%%lc\"):\n");
+                printf("\nExtended ASCII characters (128 - 255) using printf(\"%%lc\"):\n");
                 
                 for (hextet = 8; hextet < 16; hextet++) {
@@ -56 +56 @@
                         
                         uint8_t index;
-                        for (index = 0; index < 16; index++)
-                                printf("%c", (char) ((hextet << 4) + index));
-                        
-                        printf("  ");
                         for (index = 0; index < 16; index++)
                                 printf("%lc", (wchar_t) ((hextet << 4) + index));