From c4c5594de874da67bc08d28c4c2a78b59332a070 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 5 Mar 2001 07:07:43 +0000
Subject: [PATCH] MFC: 1.36:  use off_t for the size variable used to calculate
 the size of             the partition and use ULL suffix for constants to
 ensure that 			we use 64 bit math to reduce overflow in disk
 space calculations

---
 sbin/disklabel/disklabel.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index cec9cc0191c6..26c2ee3bfc28 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1331,7 +1331,7 @@ checklabel(lp)
 	register struct partition *pp;
 	int i, errors = 0;
 	char part;
-	unsigned long total_size,total_percent,current_offset;
+	unsigned long total_size, total_percent, current_offset;
 	int seen_default_offset;
 	int hog_part;
 	int j;
@@ -1394,7 +1394,7 @@ checklabel(lp)
 				}
 			} else {
 				char *type;
-				unsigned long size;
+				off_t size;
 
 				size = pp->p_size;
 				switch (part_size_type[i]) {
@@ -1403,15 +1403,15 @@ checklabel(lp)
 					break;
 				case 'k':
 				case 'K':
-					size *= 1024UL;
+					size *= 1024ULL;
 					break;
 				case 'm':
 				case 'M':
-					size *= ((unsigned long) 1024*1024);
+					size *= 1024ULL * 1024ULL;
 					break;
 				case 'g':
 				case 'G':
-					size *= ((unsigned long) 1024*1024*1024);
+					size *= 1024ULL * 1024ULL * 1024ULL;
 					break;
 				case '\0':
 					break;