diff options
| -rw-r--r-- | release/sysinstall/label.c | 16 | ||||
| -rw-r--r-- | usr.sbin/sade/label.c | 16 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/label.c | 16 |
3 files changed, 15 insertions, 33 deletions
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c index 4e7abce..7136e1f 100644 --- a/release/sysinstall/label.c +++ b/release/sysinstall/label.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: label.c,v 1.76 1997/09/20 06:24:17 jkh Exp $ + * $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -130,17 +130,11 @@ diskLabelEditor(dialogMenuItem *self) return DITEM_FAILURE; } else if (cnt) { - int j; - /* Some are already selected */ - for (j = 0; j < cnt; j++) { - if (devs[j]->enabled) { - if (variable_get(VAR_NONINTERACTIVE)) - i |= diskLabelNonInteractive(devs[j]); - else - i |= diskLabel(devs[j]); - } - } + if (variable_get(VAR_NONINTERACTIVE)) + i |= diskLabelNonInteractive(devs[0]); + else + i |= diskLabel(devs[0]); } else { /* No disks are selected, fall-back case now */ diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c index 4e7abce..7136e1f 100644 --- a/usr.sbin/sade/label.c +++ b/usr.sbin/sade/label.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: label.c,v 1.76 1997/09/20 06:24:17 jkh Exp $ + * $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -130,17 +130,11 @@ diskLabelEditor(dialogMenuItem *self) return DITEM_FAILURE; } else if (cnt) { - int j; - /* Some are already selected */ - for (j = 0; j < cnt; j++) { - if (devs[j]->enabled) { - if (variable_get(VAR_NONINTERACTIVE)) - i |= diskLabelNonInteractive(devs[j]); - else - i |= diskLabel(devs[j]); - } - } + if (variable_get(VAR_NONINTERACTIVE)) + i |= diskLabelNonInteractive(devs[0]); + else + i |= diskLabel(devs[0]); } else { /* No disks are selected, fall-back case now */ diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c index 4e7abce..7136e1f 100644 --- a/usr.sbin/sysinstall/label.c +++ b/usr.sbin/sysinstall/label.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: label.c,v 1.76 1997/09/20 06:24:17 jkh Exp $ + * $Id: label.c,v 1.77 1997/10/12 16:21:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -130,17 +130,11 @@ diskLabelEditor(dialogMenuItem *self) return DITEM_FAILURE; } else if (cnt) { - int j; - /* Some are already selected */ - for (j = 0; j < cnt; j++) { - if (devs[j]->enabled) { - if (variable_get(VAR_NONINTERACTIVE)) - i |= diskLabelNonInteractive(devs[j]); - else - i |= diskLabel(devs[j]); - } - } + if (variable_get(VAR_NONINTERACTIVE)) + i |= diskLabelNonInteractive(devs[0]); + else + i |= diskLabel(devs[0]); } else { /* No disks are selected, fall-back case now */ |
