From owner-svn-src-all@FreeBSD.ORG  Sat Mar  6 22:38:39 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C2E51065674;
	Sat,  6 Mar 2010 22:38:39 +0000 (UTC)
	(envelope-from ache@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 158688FC0C;
	Sat,  6 Mar 2010 22:38:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o26MccHC058112;
	Sat, 6 Mar 2010 22:38:38 GMT (envelope-from ache@svn.freebsd.org)
Received: (from ache@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o26MccmU058110;
	Sat, 6 Mar 2010 22:38:38 GMT (envelope-from ache@svn.freebsd.org)
Message-Id: <201003062238.o26MccmU058110@svn.freebsd.org>
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Sat, 6 Mar 2010 22:38:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204811 - head/usr.bin/uniq
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Mar 2010 22:38:39 -0000

Author: ache
Date: Sat Mar  6 22:38:38 2010
New Revision: 204811
URL: http://svn.freebsd.org/changeset/base/204811

Log:
  Remove vestiges of old %-format which prevents build on amd64

Modified:
  head/usr.bin/uniq/uniq.c

Modified: head/usr.bin/uniq/uniq.c
==============================================================================
--- head/usr.bin/uniq/uniq.c	Sat Mar  6 22:04:45 2010	(r204810)
+++ head/usr.bin/uniq/uniq.c	Sat Mar  6 22:38:38 2010	(r204811)
@@ -195,7 +195,7 @@ getlinemax(char *buf, FILE *fp)
 	while ((ch = getc(fp)) != EOF && ch != '\n') {
 		buf[bufpos++] = ch;
 		if (bufpos >= LINE_MAX)
-			errx(1, "Maximum line length (%zu) exceeded",
+			errx(1, "Maximum line length (%d) exceeded",
 			     LINE_MAX);
 	}
 	buf[bufpos] = '\0';
@@ -210,7 +210,7 @@ convert(wchar_t *buf, const char *str)
 	wchar_t *p, *ret;
 
 	if ((n = mbstowcs(buf, str, LINE_MAX)) == LINE_MAX)
-		errx(1, "Maximum line length (%zu) exceeded", LINE_MAX);
+		errx(1, "Maximum line length (%d) exceeded", LINE_MAX);
 	else if (n != (size_t)-1) {
 		/* If requested get the chosen fields + character offsets. */
 		if (numfields || numchars)