diff options
| author | das <das@FreeBSD.org> | 2009-03-02 04:07:58 +0000 |
|---|---|---|
| committer | das <das@FreeBSD.org> | 2009-03-02 04:07:58 +0000 |
| commit | f45a0d48ab7989f50f71029b2e5ed440eb497df1 (patch) | |
| tree | 6b620f4b1c8ae0f7bd866f34d69ded37205075f8 /lib/libc/stdio | |
| parent | bee5c21429eb9daa5588985d3f61048ca5b6a8bc (diff) | |
| download | FreeBSD-src-f45a0d48ab7989f50f71029b2e5ed440eb497df1.zip FreeBSD-src-f45a0d48ab7989f50f71029b2e5ed440eb497df1.tar.gz | |
The argument corresponding to %zn is supposed to be an ssize_t *, not
a size_t *, although the distinction is moot in practice.
Diffstat (limited to 'lib/libc/stdio')
| -rw-r--r-- | lib/libc/stdio/printf-pos.c | 10 | ||||
| -rw-r--r-- | lib/libc/stdio/printflocal.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/libc/stdio/printf-pos.c b/lib/libc/stdio/printf-pos.c index 351bed5..1648957 100644 --- a/lib/libc/stdio/printf-pos.c +++ b/lib/libc/stdio/printf-pos.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); enum typeid { T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT, T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG, - T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SIZET, + T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SSIZET, T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR, T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR }; @@ -374,7 +374,7 @@ reswitch: switch (ch) { else if (flags & PTRDIFFT) error = addtype(&types, TP_PTRDIFFT); else if (flags & SIZET) - error = addtype(&types, TP_SIZET); + error = addtype(&types, TP_SSIZET); else if (flags & LLONGINT) error = addtype(&types, TP_LLONG); else if (flags & LONGINT) @@ -565,7 +565,7 @@ reswitch: switch (ch) { else if (flags & PTRDIFFT) error = addtype(&types, TP_PTRDIFFT); else if (flags & SIZET) - error = addtype(&types, TP_SIZET); + error = addtype(&types, TP_SSIZET); else if (flags & LLONGINT) error = addtype(&types, TP_LLONG); else if (flags & LONGINT) @@ -719,8 +719,8 @@ build_arg_table(struct typetable *types, va_list ap, union arg **argtable) case T_SSIZET: (*argtable) [n].sizearg = va_arg (ap, ssize_t); break; - case TP_SIZET: - (*argtable) [n].psizearg = va_arg (ap, size_t *); + case TP_SSIZET: + (*argtable) [n].pssizearg = va_arg (ap, ssize_t *); break; case T_INTMAXT: (*argtable) [n].intmaxarg = va_arg (ap, intmax_t); diff --git a/lib/libc/stdio/printflocal.h b/lib/libc/stdio/printflocal.h index 763ef9b..3cef7bd 100644 --- a/lib/libc/stdio/printflocal.h +++ b/lib/libc/stdio/printflocal.h @@ -79,7 +79,7 @@ union arg { long *plongarg; long long *plonglongarg; ptrdiff_t *pptrdiffarg; - size_t *psizearg; + ssize_t *pssizearg; intmax_t *pintmaxarg; #ifndef NO_FLOATING_POINT double doublearg; |
