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

Changeset 84439d7 in mainline for boot/generic/src/printf_core.c


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
  • boot/generic/src/printf_core.c

    r56b962d r84439d7  
    7979        PrintfQualifierLong,
    8080        PrintfQualifierLongLong,
    81         PrintfQualifierPointer
     81        PrintfQualifierPointer,
     82        PrintfQualifierSize
    8283} qualifier_t;
    8384
     
    431432 *  - ""   Signed or unsigned int (default value).@n
    432433 *  - "l"  Signed or unsigned long int.@n
    433  *         If conversion is "c", the character is wchar_t (wide character).@n
    434  *         If conversion is "s", the string is wchar_t * (wide string).@n
    435434 *  - "ll" Signed or unsigned long long int.@n
    436435 *
     
    612611                                }
    613612                                break;
     613                        case 'z':
     614                                qualifier = PrintfQualifierSize;
     615                                i = nxt;
     616                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
     617                                break;
    614618                        default:
    615619                                /* Default type */
     
    720724                                number = (uint64_t) (uintptr_t) va_arg(ap, void *);
    721725                                break;
     726                        case PrintfQualifierSize:
     727                                size = sizeof(size_t);
     728                                number = (uint64_t) va_arg(ap, size_t);
     729                                break;
    722730                        default:
    723731                                /* Unknown qualifier */
Note: See TracChangeset for help on using the changeset viewer.