Fix bogusly shadowed variable.

Submitted by:	Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
This commit is contained in:
Jordan K. Hubbard 1998-03-13 11:09:03 +00:00
parent 13a8a44971
commit ea31e8b2d6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=34543
3 changed files with 9 additions and 15 deletions

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */