From owner-svn-src-stable-7@FreeBSD.ORG  Sat Mar 14 18:19:51 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E0A1106564A;
	Sat, 14 Mar 2009 18:19:51 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B6C98FC12;
	Sat, 14 Mar 2009 18:19:51 +0000 (UTC) (envelope-from das@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2EIJphe003730;
	Sat, 14 Mar 2009 18:19:51 GMT (envelope-from das@svn.freebsd.org)
Received: (from das@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2EIJouL003728;
	Sat, 14 Mar 2009 18:19:50 GMT (envelope-from das@svn.freebsd.org)
Message-Id: <200903141819.n2EIJouL003728@svn.freebsd.org>
From: David Schultz <das@FreeBSD.org>
Date: Sat, 14 Mar 2009 18:19:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189802 - in stable/7/lib/libc: . stdio
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Mar 2009 18:19:51 -0000

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() \