cvs commit: src/tools/tools/recoverdisk recoverdisk.c

[Poul-Henning Kamp]

Go for it.


In message <xzpekjph3lr.fsf at 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 at FreeBSD.org> writes:
>>   Log:
>>   Stop amd64 warnings.
>
>Better patch attached.
>
>DES
>--=20
>Dag-Erling Sm=F8rgrav - des at 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 at 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.