diff options
| author | phk <phk@FreeBSD.org> | 1997-11-07 09:21:01 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-11-07 09:21:01 +0000 |
| commit | ccc7e7fa9fe3a03b7d36abe1e051eb84caa89480 (patch) | |
| tree | 1bd13ce5c0eb05db5c842c70e635cd52797224f3 /sys/kern/subr_diskslice.c | |
| parent | 4d268889365c1d9414bbca2f6c63d87db74ec37b (diff) | |
| download | FreeBSD-src-ccc7e7fa9fe3a03b7d36abe1e051eb84caa89480.zip FreeBSD-src-ccc7e7fa9fe3a03b7d36abe1e051eb84caa89480.tar.gz | |
Rename some local variables to avoid shadowing other local variables.
Found by: -Wshadow
Diffstat (limited to 'sys/kern/subr_diskslice.c')
| -rw-r--r-- | sys/kern/subr_diskslice.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index f5a8e58..f5b284f 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.37 1997/09/02 20:05:50 bde Exp $ + * $Id: subr_diskslice.c,v 1.38 1997/09/16 10:11:49 bde Exp $ */ #include <sys/param.h> @@ -397,12 +397,12 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom) return (EINVAL); if (!*(int *)data) for (slice = 0; slice < ssp->dss_nslices; slice++) { - u_char openmask; + u_char openmask1; - openmask = ssp->dss_slices[slice].ds_openmask; - if (openmask + openmask1 = ssp->dss_slices[slice].ds_openmask; + if (openmask1 && (slice != WHOLE_DISK_SLICE - || openmask & ~(1 << RAW_PART))) + || openmask1 & ~(1 << RAW_PART))) return (EBUSY); } |
