From owner-cvs-src@FreeBSD.ORG  Sat Oct 23 15:14:09 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 4994716A4CE; Sat, 23 Oct 2004 15:14:09 +0000 (GMT)
Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 9DF4543D39; Sat, 23 Oct 2004 15:14:08 +0000 (GMT)
	(envelope-from phk@critter.freebsd.dk)
Received: from critter.freebsd.dk (localhost [127.0.0.1])
	by critter.freebsd.dk (8.13.1/8.13.1) with ESMTP id i9NFE5Nv075619;
	Sat, 23 Oct 2004 17:14:05 +0200 (CEST)
	(envelope-from phk@critter.freebsd.dk)
To: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=)
From: "Poul-Henning Kamp" <phk@phk.freebsd.dk>
In-Reply-To: Your message of "Sat, 23 Oct 2004 17:10:56 +0200."
             <xzpekjph3lr.fsf@dwp.des.no> 
Date: Sat, 23 Oct 2004 17:14:05 +0200
Message-ID: <75618.1098544445@critter.freebsd.dk>
Sender: phk@critter.freebsd.dk
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:14:09 -0000


Go for it.


In message <xzpekjph3lr.fsf@dwp.des.no>, =?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=
 writes:
>--=-=-=
>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;
>
>--=-=-=--
>

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk@FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.