From owner-cvs-src@FreeBSD.ORG  Sat Oct 23 15:11:05 2004
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D86CB16A4CE; Sat, 23 Oct 2004 15:11:05 +0000 (GMT)
Received: from smtp.des.no (flood.des.no [217.116.83.31])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3077D43D48; Sat, 23 Oct 2004 15:11:05 +0000 (GMT)
	(envelope-from des@des.no)
Received: by smtp.des.no (Pony Express, from userid 666)
	id 1B3145311; Sat, 23 Oct 2004 17:11:04 +0200 (CEST)
Received: from dwp.des.no (des.no [80.203.228.37])
	by smtp.des.no (Pony Express) with ESMTP id 85AD95310;
	Sat, 23 Oct 2004 17:10:57 +0200 (CEST)
Received: by dwp.des.no (Postfix, from userid 2602)
	id 48F9AB861; Sat, 23 Oct 2004 17:10:57 +0200 (CEST)
To: Poul-Henning Kamp <phk@FreeBSD.org>
References: <200410231242.i9NCgIs8092093@repoman.freebsd.org>
From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=)
Date: Sat, 23 Oct 2004 17:10:56 +0200
In-Reply-To: <200410231242.i9NCgIs8092093@repoman.freebsd.org> (Poul-Henning
 Kamp's message of "Sat, 23 Oct 2004 12:42:18 +0000 (UTC)")
Message-ID: <xzpekjph3lr.fsf@dwp.des.no>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Checker-Version: SpamAssassin 2.64 (2004-01-11) on flood.des.no
X-Spam-Level: 
X-Spam-Status: No, hits=0.0 required=5.0 tests=AWL autolearn=no version=2.64
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/tools/tools/recoverdisk recoverdisk.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Oct 2004 15:11:06 -0000

--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable

Poul-Henning Kamp <phk@FreeBSD.org> writes:
>   Log:
>   Stop amd64 warnings.

Better patch attached.

DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no


--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=recoverdisk.diff

Index: recoverdisk.c
===================================================================
RCS file: /home/ncvs/src/tools/tools/recoverdisk/recoverdisk.c,v
retrieving revision 1.3
diff -u -r1.3 recoverdisk.c
--- recoverdisk.c	23 Oct 2004 12:42:18 -0000	1.3
+++ recoverdisk.c	23 Oct 2004 15:09:58 -0000
@@ -103,9 +103,9 @@
 				i = sectorsize;
 			time(&t2);
 			if (t1 != t2 || lp->len < BIGSIZE) {
-				printf("\r%13jd %7jd %13jd %3d %13jd %13jd %.8f",
+				printf("\r%13jd %7zd %13jd %3d %13jd %13jd %.8f",
 				    (intmax_t)lp->start,
-				    (intmax_t)i, 
+				    i, 
 				    (intmax_t)lp->len,
 				    lp->state,
 				    (intmax_t)d,
@@ -125,14 +125,13 @@
 				else
 					j = i;
 				if (j != i)
-					printf("\nWrite error at %jd/%jd\n",
-					    lp->start, (intmax_t)i);
+					printf("\nWrite error at %jd/%zd\n",
+					    lp->start, i);
 				lp->start += i;
 				lp->len -= i;
 				continue;
 			}
-			printf("\n%jd %jd failed %d\n",
-			    lp->start, (intmax_t)i, errno);
+			printf("\n%jd %zd failed %d\n", lp->start, i, errno);
 			new_lump(lp->start, i, lp->state + 1);
 			lp->start += i;
 			lp->len -= i;

--=-=-=--