From owner-svn-src-user@FreeBSD.ORG  Sun Jan 30 15:10:58 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 9575D106566B;
	Sun, 30 Jan 2011 15:10:58 +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 85D108FC08;
	Sun, 30 Jan 2011 15:10:58 +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 p0UFAwGi075737;
	Sun, 30 Jan 2011 15:10:58 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UFAw8U075735;
	Sun, 30 Jan 2011 15:10:58 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201101301510.p0UFAw8U075735@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 30 Jan 2011 15:10:58 +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: r218095 - 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: Sun, 30 Jan 2011 15:10:58 -0000

Author: nwhitehorn
Date: Sun Jan 30 15:10:58 2011
New Revision: 218095
URL: http://svn.freebsd.org/changeset/base/218095

Log:
  Do not show (null) for blank labels.
  
  Submitted by:	brucec

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

Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c
==============================================================================
--- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Sun Jan 30 15:05:10 2011	(r218094)
+++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c	Sun Jan 30 15:10:58 2011	(r218095)
@@ -374,7 +374,7 @@ gpart_edit(struct gprovider *pp)
 			oldtype = gc->lg_val;
 			items[0].text = gc->lg_val;
 		}
-		if (strcmp(gc->lg_name, "label") == 0) {
+		if (strcmp(gc->lg_name, "label") == 0 && gc->lg_val != NULL) {
 			hadlabel = 1;
 			items[3].text = gc->lg_val;
 		}