Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (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 with development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/printf/printf_core.c

    r56b962d r84439d7  
    8383        PrintfQualifierLong,
    8484        PrintfQualifierLongLong,
    85         PrintfQualifierPointer
     85        PrintfQualifierPointer,
     86        PrintfQualifierSize
    8687} qualifier_t;
    8788
     
    553554 *  - ""   Signed or unsigned int (default value).@n
    554555 *  - "l"  Signed or unsigned long int.@n
    555  *         If conversion is "c", the character is wchar_t (wide character).@n
     556 *         If conversion is "c", the character is wint_t (wide character).@n
    556557 *         If conversion is "s", the string is wchar_t * (wide string).@n
    557558 *  - "ll" Signed or unsigned long long int.@n
     559 *  - "z"  Signed or unsigned ssize_t or site_t.@n
    558560 *
    559561 * CONVERSION:@n
     
    737739                                }
    738740                                break;
     741                        case 'z':
     742                                qualifier = PrintfQualifierSize;
     743                                i = nxt;
     744                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
     745                                break;
    739746                        default:
    740747                                /* Default type */
     
    764771                        case 'c':
    765772                                if (qualifier == PrintfQualifierLong)
    766                                         retval = print_wchar(va_arg(ap, wchar_t), width, flags, ps);
     773                                        retval = print_wchar(va_arg(ap, wint_t), width, flags, ps);
    767774                                else
    768775                                        retval = print_char(va_arg(ap, unsigned int), width, flags, ps);
     
    850857                                precision = size << 1;
    851858                                number = (uint64_t) (uintptr_t) va_arg(ap, void *);
     859                                break;
     860                        case PrintfQualifierSize:
     861                                size = sizeof(size_t);
     862                                number = (uint64_t) va_arg(ap, size_t);
    852863                                break;
    853864                        default:
Note: See TracChangeset for help on using the changeset viewer.