Module Name: src
Committed By: bouyer
Date: Mon May 11 19:23:33 UTC 2009
Modified Files:
src/lib/libc/stdio [netbsd-4-0]: vfwprintf.c
Log Message:
Pull up following revision(s) (requested by cube in ticket #1313):
lib/libc/stdio/vfwprintf.c: revision 1.15
printf("%zi\n", (ssize_t)-1); now correcly prints -1 on i386
ok: christos
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.1.4.1 -r1.9.2.1.4.2 src/lib/libc/stdio/vfwprintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.9.2.1.4.1 src/lib/libc/stdio/vfwprintf.c:1.9.2.1.4.2
--- src/lib/libc/stdio/vfwprintf.c:1.9.2.1.4.1 Tue Apr 8 21:10:55 2008
+++ src/lib/libc/stdio/vfwprintf.c Mon May 11 19:23:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.9.2.1.4.1 2008/04/08 21:10:55 jdc Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.9.2.1.4.2 2009/05/11 19:23:33 bouyer Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.9.2.1.4.1 2008/04/08 21:10:55 jdc Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.9.2.1.4.2 2009/05/11 19:23:33 bouyer Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -98,6 +98,7 @@
long long longlongarg;
unsigned long long ulonglongarg;
ptrdiff_t ptrdiffarg;
+ ssize_t ssizearg;
size_t sizearg;
intmax_t intmaxarg;
uintmax_t uintmaxarg;
@@ -125,7 +126,7 @@
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_SIZET, TP_SIZET,
+ T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SIZET,
T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
};
@@ -756,7 +757,7 @@
#define INTMAX_SIZE (INTMAXT|SIZET|PTRDIFFT|LLONGINT)
#define SJARG() \
(flags&INTMAXT ? GETARG(intmax_t) : \
- flags&SIZET ? (intmax_t)GETARG(size_t) : \
+ flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
(intmax_t)GETARG(long long))
#define UJARG() \
@@ -1571,7 +1572,7 @@
if (flags & INTMAXT) \
ADDTYPE(T_INTMAXT); \
else if (flags & SIZET) \
- ADDTYPE(T_SIZET); \
+ ADDTYPE(T_SSIZET); \
else if (flags & PTRDIFFT) \
ADDTYPE(T_PTRDIFFT); \
else if (flags & LLONGINT) \
@@ -1838,6 +1839,9 @@
case TP_PTRDIFFT:
(*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
break;
+ case T_SSIZET:
+ (*argtable) [n].ssizearg = va_arg (ap, ssize_t);
+ break;
case T_SIZET:
(*argtable) [n].sizearg = va_arg (ap, size_t);
break;
