From owner-svn-src-user@FreeBSD.ORG  Sat Jan  1 16:47:13 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54F341065670;
	Sat,  1 Jan 2011 16:47:13 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 43C7F8FC16;
	Sat,  1 Jan 2011 16:47:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p01GlDHl015995;
	Sat, 1 Jan 2011 16:47:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p01GlD9G015992;
	Sat, 1 Jan 2011 16:47:13 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101011647.p01GlD9G015992@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 1 Jan 2011 16:47:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216872 - user/nwhitehorn/bsdinstall/partedit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Jan 2011 16:47:13 -0000

Author: nwhitehorn
Date: Sat Jan  1 16:47:12 2011
New Revision: 216872
URL: http://svn.freebsd.org/changeset/base/216872

Log:
  Fix two display issues. Autocomputed and existing sizes were truncated to
  too few digits, which sometimes led to rounding errors when adding new
  partitions. Also, on systems with 32-bit size_t, the main panel could
  truncate the medium size, producing nonsense for the displayed sizes of
  large devices.

Modified:
  user/nwhitehorn/bsdinstall/partedit/diskeditor.h
  user/nwhitehorn/bsdinstall/partedit/gpart_ops.c

Modified: user/nwhitehorn/bsdinstall/partedit/diskeditor.h
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/diskeditor.h	Sat Jan  1 15:25:15 2011	(r216871)
+++ user/nwhitehorn/bsdinstall/partedit/diskeditor.h	Sat Jan  1 16:47:12 2011	(r216872)
@@ -1,7 +1,9 @@
+#include <inttypes.h>
+
 struct partedit_item {
 	int indentation;
 	const char *name;
-	size_t size;
+	intmax_t size;
 	const char *type;
 	char *mountpoint;
 

Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Sat Jan  1 15:25:15 2011	(r216871)
+++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Sat Jan  1 16:47:12 2011	(r216872)
@@ -353,7 +353,7 @@ gpart_edit(struct gprovider *pp)
 		}
 	}
 
-	humanize_number(sizestr, 6, pp->lg_mediasize, "B", HN_AUTOSCALE,
+	humanize_number(sizestr, 7, pp->lg_mediasize, "B", HN_AUTOSCALE,
 	    HN_NOSPACE | HN_DECIMAL);
 	items[1].text = sizestr;
 
@@ -566,7 +566,7 @@ gpart_create(struct gprovider *pp)
 	if (size*sector >= 1024*1024)
 		size -= 1024*1024/sector;
 
-	humanize_number(sizestr, 6, size*sector, "B", HN_AUTOSCALE,
+	humanize_number(sizestr, 7, size*sector, "B", HN_AUTOSCALE,
 	    HN_NOSPACE | HN_DECIMAL);
 	items[1].text = sizestr;