Changeset 1e27d85 in mainline for boot/generic/src/printf_core.c

Timestamp:

2010-11-26T01:03:29Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d16fc78

Parents:

96b89acb

Message:

• reimplement the 'z' modifier (%zu for size_t, %zd for ssize_t)
• make sure %lc actually takes wint_t argument (compliance with C99)

File:

• boot/generic/src/printf_core.c (modified) (4 diffs)

boot/generic/src/printf_core.c

@@ -79 +79 @@
         PrintfQualifierLong,
         PrintfQualifierLongLong,
-        PrintfQualifierPointer
+        PrintfQualifierPointer,
+        PrintfQualifierSize
 } qualifier_t;
 
@@ -431 +432 @@
  *  - ""   Signed or unsigned int (default value).@n
  *  - "l"  Signed or unsigned long int.@n
- *         If conversion is "c", the character is wchar_t (wide character).@n
- *         If conversion is "s", the string is wchar_t * (wide string).@n
  *  - "ll" Signed or unsigned long long int.@n
  *
@@ -612 +611 @@
                                 }
                                 break;
+                        case 'z':
+                                qualifier = PrintfQualifierSize;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
                         default:
                                 /* Default type */
@@ -720 +724 @@
                                 number = (uint64_t) (uintptr_t) va_arg(ap, void *);
                                 break;
+                        case PrintfQualifierSize:
+                                size = sizeof(size_t);
+                                number = (uint64_t) va_arg(ap, size_t);
+                                break;
                         default:
                                 /* Unknown qualifier */