summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-11-12 21:12:42 +0000
committerjhb <jhb@FreeBSD.org>2002-11-12 21:12:42 +0000
commitb7191db17bf13706a649e1f6a3fd4dfc5b324cdc (patch)
tree368a0fb79747b43237e15b925c0b66f2e84fba93
parent905d7568e9f871b8af24c49de554d1bd18a5f478 (diff)
downloadFreeBSD-src-b7191db17bf13706a649e1f6a3fd4dfc5b324cdc.zip
FreeBSD-src-b7191db17bf13706a649e1f6a3fd4dfc5b324cdc.tar.gz
Remove a line that set the status to success. We already do that at the
beginning, so the best this could achieve would be to mask an earlier failure. Break instead of continue for another failure case.
-rw-r--r--usr.sbin/sade/label.c3
-rw-r--r--usr.sbin/sysinstall/label.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 7308071..baba30a 100644
--- a/usr.sbin/sade/label.c
+++ b/usr.sbin/sade/label.c
@@ -1393,7 +1393,6 @@ diskLabelNonInteractive(Device *dev)
tmp->private_data = new_part(mpoint, TRUE);
tmp->private_free = safe_free;
((PartInfo *)tmp->private_data)->soft = soft;
- status = DITEM_SUCCESS;
}
}
}
@@ -1408,7 +1407,7 @@ diskLabelNonInteractive(Device *dev)
if (sscanf(cp, "%s %s", mpoint, do_newfs) != 2) {
msgConfirm("For slice entry %s, got an invalid detail entry of: %s", c1->name, cp);
status = DITEM_FAILURE;
- continue;
+ break;
}
newfs = toupper(do_newfs[0]) == 'Y' ? TRUE : FALSE;
if (c1->private_data) {
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 7308071..baba30a 100644
--- a/usr.sbin/sysinstall/label.c
+++ b/usr.sbin/sysinstall/label.c
@@ -1393,7 +1393,6 @@ diskLabelNonInteractive(Device *dev)
tmp->private_data = new_part(mpoint, TRUE);
tmp->private_free = safe_free;
((PartInfo *)tmp->private_data)->soft = soft;
- status = DITEM_SUCCESS;
}
}
}
@@ -1408,7 +1407,7 @@ diskLabelNonInteractive(Device *dev)
if (sscanf(cp, "%s %s", mpoint, do_newfs) != 2) {
msgConfirm("For slice entry %s, got an invalid detail entry of: %s", c1->name, cp);
status = DITEM_FAILURE;
- continue;
+ break;
}
newfs = toupper(do_newfs[0]) == 'Y' ? TRUE : FALSE;
if (c1->private_data) {
OpenPOWER on IntegriCloud