summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1998-03-13 11:09:03 +0000
committerjkh <jkh@FreeBSD.org>1998-03-13 11:09:03 +0000
commit206a0af8ed276963769678c9051c37d88f73abf2 (patch)
tree8079a84694219f3e79276f796cbf606ea0d4befc
parent18e08338dc9ac3f5d1efa242da7facbc1e9db295 (diff)
downloadFreeBSD-src-206a0af8ed276963769678c9051c37d88f73abf2.zip
FreeBSD-src-206a0af8ed276963769678c9051c37d88f73abf2.tar.gz
Fix bogusly shadowed variable.
Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
-rw-r--r--release/sysinstall/label.c8
-rw-r--r--usr.sbin/sade/label.c8
-rw-r--r--usr.sbin/sysinstall/label.c8
3 files changed, 9 insertions, 15 deletions
diff --git a/release/sysinstall/label.c b/release/sysinstall/label.c
index 1cd03fd..90ec8f9 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.80 1997/11/05 06:11:26 obrien Exp $
+ * $Id: label.c,v 1.81 1998/02/06 04:35:21 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -130,13 +130,11 @@ diskLabelEditor(dialogMenuItem *self)
return DITEM_FAILURE;
}
else if (cnt) {
- int i;
-
/* Some are already selected */
if (variable_get(VAR_NONINTERACTIVE))
- i |= diskLabelNonInteractive(NULL);
+ i = diskLabelNonInteractive(NULL);
else
- i |= diskLabel(NULL);
+ i = diskLabel(NULL);
}
else {
/* No disks are selected, fall-back case now */
diff --git a/usr.sbin/sade/label.c b/usr.sbin/sade/label.c
index 1cd03fd..90ec8f9 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.80 1997/11/05 06:11:26 obrien Exp $
+ * $Id: label.c,v 1.81 1998/02/06 04:35:21 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -130,13 +130,11 @@ diskLabelEditor(dialogMenuItem *self)
return DITEM_FAILURE;
}
else if (cnt) {
- int i;
-
/* Some are already selected */
if (variable_get(VAR_NONINTERACTIVE))
- i |= diskLabelNonInteractive(NULL);
+ i = diskLabelNonInteractive(NULL);
else
- i |= diskLabel(NULL);
+ i = diskLabel(NULL);
}
else {
/* No disks are selected, fall-back case now */
diff --git a/usr.sbin/sysinstall/label.c b/usr.sbin/sysinstall/label.c
index 1cd03fd..90ec8f9 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.80 1997/11/05 06:11:26 obrien Exp $
+ * $Id: label.c,v 1.81 1998/02/06 04:35:21 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -130,13 +130,11 @@ diskLabelEditor(dialogMenuItem *self)
return DITEM_FAILURE;
}
else if (cnt) {
- int i;
-
/* Some are already selected */
if (variable_get(VAR_NONINTERACTIVE))
- i |= diskLabelNonInteractive(NULL);
+ i = diskLabelNonInteractive(NULL);
else
- i |= diskLabel(NULL);
+ i = diskLabel(NULL);
}
else {
/* No disks are selected, fall-back case now */
OpenPOWER on IntegriCloud