summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authormatteo <matteo@FreeBSD.org>2006-05-30 19:10:18 +0000
committermatteo <matteo@FreeBSD.org>2006-05-30 19:10:18 +0000
commit74aa397f1619d246d48e795d18ac2af7027c0ef5 (patch)
tree812cc3b0e6990ad9add91579831d4afecec31709 /tools
parentbac62c64f51ac68a6a0e0c9d7ca32f2fb43de2e2 (diff)
downloadFreeBSD-src-74aa397f1619d246d48e795d18ac2af7027c0ef5.zip
FreeBSD-src-74aa397f1619d246d48e795d18ac2af7027c0ef5.tar.gz
Make recoverdisk compile on amd64 and possibly other 64bit archs.
Bump WARNS to 6. PR: amd64/97566 Reviewed by: phk@ MFC after: 3 days
Diffstat (limited to 'tools')
-rw-r--r--tools/tools/recoverdisk/Makefile2
-rw-r--r--tools/tools/recoverdisk/recoverdisk.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/tools/recoverdisk/Makefile b/tools/tools/recoverdisk/Makefile
index 1bfb3a7..6733a4f 100644
--- a/tools/tools/recoverdisk/Makefile
+++ b/tools/tools/recoverdisk/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PROG= recoverdisk
-WARNS?= 5
+WARNS?= 6
.include <bsd.prog.mk>
diff --git a/tools/tools/recoverdisk/recoverdisk.c b/tools/tools/recoverdisk/recoverdisk.c
index 0951d3c..2caa1e9 100644
--- a/tools/tools/recoverdisk/recoverdisk.c
+++ b/tools/tools/recoverdisk/recoverdisk.c
@@ -228,13 +228,13 @@ main(int argc, char * const argv[])
if (lp == NULL)
break;
while (lp->len > 0 && !aborting) {
- i = MIN(lp->len, bigsize);
+ i = MIN(lp->len, (off_t)bigsize);
if (lp->state == 1)
- i = MIN(lp->len, medsize);
+ i = MIN(lp->len, (off_t)medsize);
if (lp->state > 1)
- i = MIN(lp->len, minsize);
+ i = MIN(lp->len, (off_t)minsize);
time(&t2);
- if (t1 != t2 || lp->len < bigsize) {
+ if (t1 != t2 || lp->len < (off_t)bigsize) {
printf("\r%13jd %7zu %13jd %5d %13jd %13jd %.7f",
(intmax_t)lp->start,
i,
OpenPOWER on IntegriCloud