D40659.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40659.diff
View Options

	diff --git a/usr.sbin/bsdinstall/partedit/scripted.c b/usr.sbin/bsdinstall/partedit/scripted.c
	--- a/usr.sbin/bsdinstall/partedit/scripted.c
	+++ b/usr.sbin/bsdinstall/partedit/scripted.c
	@@ -70,12 +70,11 @@
	struct gclass *classp;
	struct gmesh mesh;
	struct ggeom *gpart = NULL;
	- int error;

	if (scheme == NULL)
	scheme = default_scheme();

	- error = geom_gettree(&mesh);
	+ geom_gettree(&mesh);
	if (provider_for_name(&mesh, disk) == NULL) {
	fprintf(stderr, "GEOM provider %s not found\n", disk);
	geom_deletetree(&mesh);
	@@ -106,7 +105,7 @@
	}

	geom_deletetree(&mesh);
	- error = geom_gettree(&mesh);
	+ geom_gettree(&mesh);

	/* Create partitions */
	if (config == NULL) {
	@@ -132,7 +131,7 @@
	gpart_create(provider_for_name(&mesh, disk), type, size, mount,
	NULL, 0);
	geom_deletetree(&mesh);
	- error = geom_gettree(&mesh);
	+ geom_gettree(&mesh);
	size = type = mount = NULL;
	}

	@@ -143,8 +142,8 @@
	return (0);
	}

	-static
	-int parse_disk_config(char *input)
	+static int
	+parse_disk_config(char *input)
	{
	char *ap;
	char disk = NULL, scheme = NULL, *partconfig = NULL;