svn commit: r271502 - user/nwhitehorn/bsdinstall_zfspartedit/partedit

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Sep 13 06:51:19 2014
New Revision: 271502
URL: http://svnweb.freebsd.org/changeset/base/271502

Log:
  Reduce diffs to head.

Modified:
  user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c
  user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c
  user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h

Modified: user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c
==============================================================================
--- user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c	Sat Sep 13 06:45:04 2014	(r271501)
+++ user/nwhitehorn/bsdinstall_zfspartedit/partedit/gpart_ops.c	Sat Sep 13 06:51:19 2014	(r271502)
@@ -584,8 +584,8 @@ editpart:
 
 	newfs_command(items[0].text, newfs, 1);
 	set_default_part_metadata(pp->lg_name, scheme, items[0].text,
-	    items[2].text,
-	    (strcmp(oldtype, items[0].text) != 0) ? newfs : NULL);
+	    items[2].text, (strcmp(oldtype, items[0].text) != 0) ?
+	    newfs : NULL);
 
 endedit:
 	if (strcmp(oldtype, items[0].text) != 0 && cp != NULL)

Modified: user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c
==============================================================================
--- user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c	Sat Sep 13 06:45:04 2014	(r271501)
+++ user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.c	Sat Sep 13 06:51:19 2014	(r271502)
@@ -377,10 +377,10 @@ apply_changes(struct gmesh *mesh)
 		dialog_msgbox("Error", message, 0, 0, TRUE);
 		return (-1);
 	}
-	fprintf(fstab, "# Device\t\tMountpoint\tFStype\tOptions\t\tDump\tPass#\n");
+	fprintf(fstab, "# Device\tMountpoint\tFStype\tOptions\tDump\tPass#\n");
 	TAILQ_FOREACH(md, &part_metadata, metadata) {
 		if (md->fstab != NULL)
-			fprintf(fstab, "%s\t\t%s\t\t%s\t%s\t\t%d\t%d\n",
+			fprintf(fstab, "%s\t%s\t\t%s\t%s\t%d\t%d\n",
 			    md->fstab->fs_spec, md->fstab->fs_file,
 			    md->fstab->fs_vfstype, md->fstab->fs_mntops,
 			    md->fstab->fs_freq, md->fstab->fs_passno);
@@ -499,7 +499,6 @@ init_fstab_metadata(void)
 		md->fstab->fs_passno = fstab->fs_passno;
 
 		md->newfs = NULL;
-		md->poolname = NULL;
 		
 		TAILQ_INSERT_TAIL(&part_metadata, md, metadata);
 	}

Modified: user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h
==============================================================================
--- user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h	Sat Sep 13 06:45:04 2014	(r271501)
+++ user/nwhitehorn/bsdinstall_zfspartedit/partedit/partedit.h	Sat Sep 13 06:51:19 2014	(r271502)
@@ -45,7 +45,6 @@ struct partition_metadata {
 	
 	struct fstab *fstab;	/* fstab data for this partition */
 	char *newfs;		/* shell command to initialize partition */
-	char *poolname;		/* ZFS pool name */
 	
 	int bootcode;