Date: Sat, 23 Oct 2004 17:10:56 +0200 From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) To: Poul-Henning Kamp <phk@FreeBSD.org> Cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/tools/tools/recoverdisk recoverdisk.c Message-ID: <xzpekjph3lr.fsf@dwp.des.no> In-Reply-To: <200410231242.i9NCgIs8092093@repoman.freebsd.org> (Poul-Henning Kamp's message of "Sat, 23 Oct 2004 12:42:18 %2B0000 (UTC)") References: <200410231242.i9NCgIs8092093@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
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;
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpekjph3lr.fsf>