svn commit: r189802 - in stable/7/lib/libc: . stdio

[David Schultz]

Author: das
Date: Sat Mar 14 18:19:50 2009
New Revision: 189802
URL: http://svn.freebsd.org/changeset/base/189802

Log:
  Partial MFC of r189131:
    Make sure %zd treats negative arguments properly on 32-bit platforms.
  
    PR:		131880

Modified:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/stdio/vfprintf.c
  stable/7/lib/libc/stdio/vfwprintf.c

Modified: stable/7/lib/libc/stdio/vfprintf.c
==============================================================================
--- stable/7/lib/libc/stdio/vfprintf.c	Sat Mar 14 17:55:16 2009	(r189801)
+++ stable/7/lib/libc/stdio/vfprintf.c	Sat Mar 14 18:19:50 2009	(r189802)
@@ -598,7 +598,7 @@ __vfprintf(FILE *fp, const char *fmt0, v
 #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() \

Modified: stable/7/lib/libc/stdio/vfwprintf.c
==============================================================================
--- stable/7/lib/libc/stdio/vfwprintf.c	Sat Mar 14 17:55:16 2009	(r189801)
+++ stable/7/lib/libc/stdio/vfwprintf.c	Sat Mar 14 18:19:50 2009	(r189802)
@@ -604,7 +604,7 @@ __vfwprintf(FILE *fp, const wchar_t *fmt
 #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() \