From 89d500c6a8cf1ab375c15052308b77f0cd4aa2ab Mon Sep 17 00:00:00 2001
From: Matteo Riondato <matteo@FreeBSD.org>
Date: Tue, 30 May 2006 19:10:18 +0000
Subject: [PATCH] Make recoverdisk compile on amd64 and possibly other 64bit
 archs. Bump WARNS to 6.

PR:		amd64/97566
Reviewed by:	phk@
MFC after:	3 days
---
 sbin/recoverdisk/Makefile             | 2 +-
 sbin/recoverdisk/recoverdisk.c        | 8 ++++----
 tools/tools/recoverdisk/Makefile      | 2 +-
 tools/tools/recoverdisk/recoverdisk.c | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile
index 1bfb3a731a9..6733a4f8fa2 100644
--- a/sbin/recoverdisk/Makefile
+++ b/sbin/recoverdisk/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PROG=	recoverdisk
-WARNS?=	5
+WARNS?=	6
 
 .include <bsd.prog.mk>
 
diff --git a/sbin/recoverdisk/recoverdisk.c b/sbin/recoverdisk/recoverdisk.c
index 0951d3cda28..2caa1e95737 100644
--- a/sbin/recoverdisk/recoverdisk.c
+++ b/sbin/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, 
diff --git a/tools/tools/recoverdisk/Makefile b/tools/tools/recoverdisk/Makefile
index 1bfb3a731a9..6733a4f8fa2 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 0951d3cda28..2caa1e95737 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,