Changeset bbe7848 in mainline for uspace/lib/c/generic/io/printf_core.c

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

• uspace/lib/c/generic/io/printf_core.c (modified) (5 diffs)

uspace/lib/c/generic/io/printf_core.c

@@ -82 +82 @@
         PrintfQualifierLong,
         PrintfQualifierLongLong,
-        PrintfQualifierPointer
+        PrintfQualifierPointer,
+        PrintfQualifierSize
 } qualifier_t;
 
@@ -552 +553 @@
  *  - ""   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 "c", the character is wint_t (wide character).@n
  *         If conversion is "s", the string is wchar_t * (wide string).@n
  *  - "ll" Signed or unsigned long long int.@n
+ *  - "z"  Signed or unsigned ssize_t or site_t.@n
  *
  * CONVERSION:@n
@@ -736 +738 @@
                                 }
                                 break;
+                        case 'z':
+                                qualifier = PrintfQualifierSize;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
                         default:
                                 /* Default type */
@@ -763 +770 @@
                         case 'c':
                                 if (qualifier == PrintfQualifierLong)
-                                        retval = print_wchar(va_arg(ap, wchar_t), width, flags, ps);
+                                        retval = print_wchar(va_arg(ap, wint_t), width, flags, ps);
                                 else
                                         retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
@@ -849 +856 @@
                                 precision = size << 1;
                                 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: